Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned up fgcp

This commit is contained in:
Adrian Cole 2012-09-15 23:45:14 -07:00
parent 49877c8f06
commit 3b3efef104
152 changed files with 6173 additions and 6191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
labs/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
View File

@ -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();
}

3
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
View File

@ -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);

5
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/CPUToProcessor.java
View File

@ -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.

5
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskToVolume.java
View File

@ -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.

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/SystemStatusNormal.java
View File

@ -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;

3
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/FGCPComputeServiceAdapter.java
View File

@ -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;

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerStatus.java
View File

@ -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).

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIPStatus.java
View File

@ -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>

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDiskStatus.java
View File

@ -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.
*

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerStatus.java
View File

@ -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.
*

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemStatus.java
View File

@ -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.
*

2
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/package-info.java
View File

@ -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;

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java
View File

@ -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;

5
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPRetryIfNotProxyAuthenticationFailureHandler.java
View File

@ -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.

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApi.java
View File

@ -18,7 +18,6 @@
*/
package org.jclouds.fujitsu.fgcp.services;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskAsyncApi.java
View File

@ -18,7 +18,6 @@
*/
package org.jclouds.fujitsu.fgcp.services;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.Consumes;

8
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/FirewallAsyncApi.java
View File

@ -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;

14
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/LoadBalancerAsyncApi.java
View File

@ -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

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressAsyncApi.java
View File

@ -18,7 +18,6 @@
*/
package org.jclouds.fujitsu.fgcp.services;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.Consumes;

14
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApi.java
View File

@ -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.
*

17
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/BindParamsToXmlPayload.java
View File

@ -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) {

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetDiskImageAttributesResponse.java
View File

@ -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.
*

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPAttributesResponse.java
View File

@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.fujitsu.fgcp.domain.PublicIP;
import com.google.common.collect.Iterables;
/**

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/MapWithStatusResponse.java
View File

@ -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.

4
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SetWithStatusResponse.java
View File

@ -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.

1
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusResponse.java
View File

@ -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.

2
labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/package-info.java
View File

@ -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;

17
labs/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPRestClientModuleTest.java
View File

@ -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

1
labs/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystemTest.java
View File

@ -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;

2
labs/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApiExpectTest.java
View File

@ -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;

2
labs/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
View File

@ -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;

2
labs/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
View File

@ -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;