mirror of https://github.com/apache/jclouds.git
cleaned up fgcp
This commit is contained in:
parent
49877c8f06
commit
3b3efef104
|
@ -30,6 +30,9 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
|
|||
*/
|
||||
public class FGCPAUProviderMetadata extends FGCPProviderMetadata {
|
||||
|
||||
/** The serialVersionUID */
|
||||
private static final long serialVersionUID = 1735901960026547803L;
|
||||
|
||||
public static Builder builder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
|
|
@ -40,6 +40,9 @@ import com.google.inject.Module;
|
|||
*/
|
||||
public class FGCPApiMetadata extends BaseRestApiMetadata {
|
||||
|
||||
/** The serialVersionUID */
|
||||
private static final long serialVersionUID = -8430912756058292588L;
|
||||
|
||||
@Override
|
||||
public Builder toBuilder() {
|
||||
return new Builder().fromApiMetadata(this);
|
||||
|
|
|
@ -20,11 +20,12 @@ package org.jclouds.fujitsu.fgcp.compute.functions;
|
|||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import javax.inject.Singleton;
|
||||
|
||||
import org.jclouds.compute.domain.Processor;
|
||||
import org.jclouds.fujitsu.fgcp.domain.CPU;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
import com.google.common.base.Function;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
|
|
|
@ -20,12 +20,13 @@ package org.jclouds.fujitsu.fgcp.compute.functions;
|
|||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import javax.inject.Singleton;
|
||||
|
||||
import org.jclouds.compute.domain.Volume;
|
||||
import org.jclouds.compute.domain.VolumeBuilder;
|
||||
import org.jclouds.fujitsu.fgcp.domain.Disk;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
import com.google.common.base.Function;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
|
|
|
@ -23,7 +23,6 @@ import javax.inject.Inject;
|
|||
import javax.inject.Singleton;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.FGCPApi;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
|
||||
import org.jclouds.logging.Logger;
|
||||
|
||||
|
|
|
@ -44,10 +44,8 @@ import org.jclouds.fujitsu.fgcp.compute.functions.ResourceIdToSystemId;
|
|||
import org.jclouds.fujitsu.fgcp.compute.predicates.ServerStopped;
|
||||
import org.jclouds.fujitsu.fgcp.compute.predicates.SystemStatusNormal;
|
||||
import org.jclouds.fujitsu.fgcp.compute.strategy.VServerMetadata.Builder;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerConfiguration;
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage;
|
||||
import org.jclouds.fujitsu.fgcp.domain.ServerType;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServer;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerWithVNICs;
|
||||
|
@ -59,7 +57,6 @@ import org.jclouds.predicates.RetryablePredicate;
|
|||
import com.google.common.base.Predicate;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.util.concurrent.Futures;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Possible statuses of a built-in server, also called extended function module
|
||||
* (EFM), such as a firewall or load balancer (SLB).
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Possible statuses of a public IP address.
|
||||
* <p>
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Possible statuses of an attachable virtual disk.
|
||||
*
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Possible statuses of a virtual server.
|
||||
*
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
* Possible statuses of a virtual system.
|
||||
*
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
package org.jclouds.fujitsu.fgcp.domain;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlSchema;
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ import javax.ws.rs.core.MediaType;
|
|||
import javax.ws.rs.core.UriBuilder;
|
||||
|
||||
import org.jclouds.Constants;
|
||||
import org.jclouds.crypto.CryptoStreams;
|
||||
import org.jclouds.date.TimeStamp;
|
||||
import org.jclouds.encryption.internal.Base64;
|
||||
import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
|
||||
|
|
|
@ -18,13 +18,14 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.handlers;
|
||||
|
||||
import com.google.inject.Singleton;
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.jclouds.http.HttpCommand;
|
||||
import org.jclouds.http.HttpResponse;
|
||||
import org.jclouds.http.HttpRetryHandler;
|
||||
import org.jclouds.logging.Logger;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import com.google.inject.Singleton;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.jclouds.concurrent.Timeout;
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
|
@ -22,23 +22,15 @@ import java.util.Set;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.concurrent.Timeout;
|
||||
import org.jclouds.fujitsu.fgcp.FGCPAsyncApi;
|
||||
import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
|
||||
import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerBackup;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerConfiguration;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerStatus;
|
||||
import org.jclouds.fujitsu.fgcp.domain.Rule;
|
||||
import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
|
||||
import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
|
||||
import org.jclouds.rest.annotations.BinderParam;
|
||||
import org.jclouds.rest.annotations.JAXBResponseParser;
|
||||
import org.jclouds.rest.annotations.PayloadParams;
|
||||
import org.jclouds.rest.annotations.QueryParams;
|
||||
|
|
|
@ -18,32 +18,18 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.concurrent.Timeout;
|
||||
import org.jclouds.fujitsu.fgcp.FGCPAsyncApi;
|
||||
import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
|
||||
import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerBackup;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerConfiguration;
|
||||
import org.jclouds.fujitsu.fgcp.domain.BuiltinServerStatus;
|
||||
import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
|
||||
import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
|
||||
import org.jclouds.rest.annotations.BinderParam;
|
||||
import org.jclouds.rest.annotations.JAXBResponseParser;
|
||||
import org.jclouds.rest.annotations.PayloadParams;
|
||||
import org.jclouds.rest.annotations.QueryParams;
|
||||
import org.jclouds.rest.annotations.RequestFilters;
|
||||
import org.jclouds.rest.annotations.Transform;
|
||||
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
/**
|
||||
* Non-blocking API relating to a built-in server, also called extended function
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
|
@ -18,13 +18,21 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import org.jclouds.concurrent.Timeout;
|
||||
import org.jclouds.fujitsu.fgcp.domain.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.jclouds.concurrent.Timeout;
|
||||
import org.jclouds.fujitsu.fgcp.domain.AddressRange;
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage;
|
||||
import org.jclouds.fujitsu.fgcp.domain.EventLog;
|
||||
import org.jclouds.fujitsu.fgcp.domain.Information;
|
||||
import org.jclouds.fujitsu.fgcp.domain.PublicIP;
|
||||
import org.jclouds.fujitsu.fgcp.domain.ServerType;
|
||||
import org.jclouds.fujitsu.fgcp.domain.UsageInfo;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VSystem;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
|
||||
|
||||
/**
|
||||
* API relating to the virtual data center.
|
||||
*
|
||||
|
|
|
@ -18,18 +18,20 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.xml;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
|
||||
import org.jclouds.http.HttpRequest;
|
||||
import org.jclouds.rest.MapBinder;
|
||||
import org.jclouds.rest.binders.BindToStringPayload;
|
||||
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
import com.google.common.base.Strings;
|
||||
|
||||
/**
|
||||
* Not currently used but leaving for reference when implementing multipart POST
|
||||
|
@ -40,6 +42,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
|||
public class BindParamsToXmlPayload extends BindToStringPayload implements
|
||||
MapBinder {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public <R extends HttpRequest> R bindToRequest(R request,
|
||||
Map<String, Object> mapParams) {
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.xml.internal;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage;
|
||||
|
||||
/**
|
||||
* Wrapper for GetDiskImageAttributesResponse.
|
||||
*
|
||||
|
|
|
@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement;
|
|||
|
||||
import org.jclouds.fujitsu.fgcp.domain.PublicIP;
|
||||
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
|
||||
/**
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.xml.internal;
|
||||
|
||||
import com.google.common.collect.ForwardingMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
|
||||
import com.google.common.collect.ForwardingMap;
|
||||
|
||||
/**
|
||||
* Special base class extending (forwardable) Map with fields for the elements
|
||||
* that FGCP XML responses specify.
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.xml.internal;
|
||||
|
||||
import com.google.common.collect.ForwardingSet;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
|
||||
import com.google.common.collect.ForwardingSet;
|
||||
|
||||
/**
|
||||
* Special base class extending (forwardable) Set with fields for the elements
|
||||
* that FGCP XML responses specify.
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
package org.jclouds.fujitsu.fgcp.xml.internal;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* Base class with fields for the elements that FGCP XML responses specify.
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
package org.jclouds.fujitsu.fgcp.xml.internal;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlSchema;
|
||||
|
||||
|
|
|
@ -18,15 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.compute;
|
||||
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
import org.jclouds.crypto.Crypto;
|
||||
import org.jclouds.fujitsu.fgcp.FGCPApiMetadata;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
import org.testng.annotations.BeforeTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.security.KeyStore;
|
||||
|
@ -34,9 +27,13 @@ import java.security.KeyStoreException;
|
|||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
import java.util.Scanner;
|
||||
|
||||
import static org.testng.Assert.*;
|
||||
import org.jclouds.crypto.Crypto;
|
||||
import org.testng.annotations.BeforeTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
|
||||
/**
|
||||
* @author Dies Koper
|
||||
|
|
|
@ -11,7 +11,6 @@ import java.util.List;
|
|||
|
||||
import org.jclouds.compute.domain.OperatingSystem;
|
||||
import org.jclouds.compute.domain.OsFamily;
|
||||
import org.jclouds.fujitsu.fgcp.compute.functions.DiskImageToOperatingSystem;
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage;
|
||||
import org.jclouds.fujitsu.fgcp.domain.DiskImage.Builder;
|
||||
import org.testng.annotations.Test;
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
|
@ -18,10 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.domain.VSystem;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
|
||||
import org.jclouds.http.HttpRequest;
|
||||
import org.jclouds.http.HttpResponse;
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.fujitsu.fgcp.services;
|
||||
|
||||
import static org.testng.AssertJUnit.assertNotNull;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.AssertJUnit.assertNotNull;
|
||||
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
|
||||
import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
|
||||
|
|
Loading…
Reference in New Issue