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

fixed some quality issues

This commit is contained in:
Adrian Cole 2011-11-27 11:30:19 -05:00
parent a530b5b5d6
commit 4c835851de
8 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java
View File

@ -44,11 +44,10 @@ public class BindSnapshotPolicyScheduleToQueryParam implements Binder {
this.uriBuilderProvider = checkNotNull(uriBuilderProvider, "uriBuilderProvider");
}
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
checkArgument(input instanceof SnapshotPolicySchedule, "this binder is only valid for SnapshotPolicySchedule");
SnapshotPolicySchedule schedule = (SnapshotPolicySchedule) input;
SnapshotPolicySchedule schedule = SnapshotPolicySchedule.class.cast(input);
R modifiedResult = ModifyRequest.addQueryParam(request, "intervaltype", schedule.getInterval(), uriBuilderProvider.get());
modifiedResult = ModifyRequest.addQueryParam(modifiedResult, "schedule", schedule.getTime(), uriBuilderProvider.get());
return modifiedResult;

10
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
View File

@ -63,6 +63,7 @@ public class Volume implements Comparable<Volume> {
private long snapshotId;
private String state;
private String storage;
// TODO enum
private String storageType;
private VolumeType type;
private long virtualMachineId;
@ -223,11 +224,10 @@ public class Volume implements Comparable<Volume> {
}
public Volume build() {
return new Volume(id, attached, created, destroyed, deviceId, diskOfferingDisplayText,
diskOfferingId, diskOfferingName, domain, domainId, hypervisor, isExtractable,
jobId, jobStatus, name, serviceOfferingDisplayText, serviceOfferingId,
serviceOfferingName, size, snapshotId, state, storage, storage, type, virtualMachineId,
vmDisplayName, vmName, vmState, zoneId, zoneName);
return new Volume(id, attached, created, destroyed, deviceId, diskOfferingDisplayText, diskOfferingId,
diskOfferingName, domain, domainId, hypervisor, isExtractable, jobId, jobStatus, name,
serviceOfferingDisplayText, serviceOfferingId, serviceOfferingName, size, snapshotId, state, storage,
storageType, type, virtualMachineId, vmDisplayName, vmName, vmState, zoneId, zoneName);
}
}

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java
View File

@ -18,9 +18,9 @@
*/
package org.jclouds.cloudstack.options;
import com.google.common.collect.ImmutableSet;
import org.jclouds.cloudstack.domain.ISO;
import org.jclouds.http.options.BaseHttpRequestOptions;
import com.google.common.collect.ImmutableSet;
/**
* Options for the ISO listISOs method.

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java
View File

@ -18,11 +18,10 @@
*/
package org.jclouds.cloudstack.options;
import com.google.common.collect.ImmutableSet;
import org.jclouds.cloudstack.domain.NetworkType;
import org.jclouds.cloudstack.domain.TrafficType;
import org.jclouds.http.options.BaseHttpRequestOptions;
import com.google.common.collect.ImmutableSet;
/**
* Options used to control what VMGroups information is returned
*

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java
View File

@ -147,7 +147,7 @@ public class ListVolumesOptions extends AccountInDomainOptions {
*/
public static ListVolumesOptions isRecursive(boolean recursive) {
ListVolumesOptions options = new ListVolumesOptions();
return isRecursive(recursive);
return options.isRecursive(recursive);
}
/**

1
apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java
View File

@ -19,7 +19,6 @@
package org.jclouds.cloudstack.options;
import com.google.common.collect.ImmutableSet;
import org.jclouds.http.options.BaseHttpRequestOptions;
/**
* Options for the ISO registerISO method.

39
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotClientLiveTest.java
View File

@ -18,22 +18,24 @@
*/
package org.jclouds.cloudstack.features;
import static com.google.common.collect.Iterables.find;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertNotSame;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertTrue;
import java.util.Set;
import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.Snapshot;
import org.jclouds.cloudstack.options.ListSnapshotsOptions;
import org.testng.annotations.Test;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.Snapshot;
import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.options.ListSnapshotsOptions;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Nullable;
import java.util.Set;
import static com.google.common.collect.Iterables.find;
import static org.testng.AssertJUnit.*;
/**
* Tests behavior of {@code SnapshotClient}
@ -42,17 +44,6 @@ import static org.testng.AssertJUnit.*;
*/
@Test(groups = "live", singleThreaded = true, testName = "SnapshotClientLiveTest")
public class SnapshotClientLiveTest extends BaseCloudStackClientLiveTest {
protected String prefix = System.getProperty("user.name");
private long zoneId;
@BeforeMethod(groups = "live")
public void setZoneId() {
Set<Zone> zones = client.getZoneClient().listZones();
assertNotNull(zones);
assertFalse(zones.isEmpty());
zoneId = Iterables.get(zones, 0).getId();
}
public void testListSnapshots() {
Set<Snapshot> snapshots = client.getSnapshotClient().listSnapshots();

9
apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java
View File

@ -23,7 +23,12 @@ import static org.testng.Assert.assertTrue;
import java.io.InputStream;
import org.jclouds.cloudstack.domain.*;
import org.jclouds.cloudstack.domain.AsyncJob;
import org.jclouds.cloudstack.domain.AsyncJobError;
import org.jclouds.cloudstack.domain.IPForwardingRule;
import org.jclouds.cloudstack.domain.PublicIPAddress;
import org.jclouds.cloudstack.domain.Template;
import org.jclouds.cloudstack.domain.TemplateExtraction;
import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.domain.JsonBall;
import org.jclouds.http.HttpResponse;
@ -188,7 +193,7 @@ public class ParseAsyncJobFromHttpResponseTest {
public void testOverloadedKeyName() {
InputStream is = getClass().getResourceAsStream("/queryasyncjobresultresponse-createtemplate.json");
ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
AsyncJob response = parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(is)));
AsyncJob<?> response = parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(is)));
assertTrue(response.getResult() instanceof Template, "response expected to be Template, actually is "+response.getResult().getClass());
is = getClass().getResourceAsStream("/queryasyncjobresultresponse-extracttemplate.json");