From e62d0c45e33c828ad50b39a859c76e34505e755f Mon Sep 17 00:00:00 2001 From: Jason King Date: Tue, 6 Dec 2011 14:32:36 +0000 Subject: [PATCH] Issue 695: Moved cpu related classes to own package --- .../domain/resource/ComputePoolResourceSummary.java | 1 + .../domain/resource/{ => cpu}/ComputePoolCpuUsage.java | 3 +-- .../{ => cpu}/ComputePoolCpuUsageDetailSummaryEntry.java | 6 +++--- .../resource/{ => cpu}/CpuComputeResourceSummary.java | 3 ++- .../domain/resource/{ => cpu}/CpuUsageDetails.java | 2 +- .../tmrk/enterprisecloud/features/ResourceAsyncClient.java | 2 +- .../tmrk/enterprisecloud/features/ResourceClient.java | 2 +- .../enterprisecloud/features/ResourceClientLiveTest.java | 2 +- .../xml/ComputePoolCpuUsageJAXBParsingTest.java | 6 +++--- .../xml/ComputePoolResourceSummaryJAXBParsingTest.java | 1 + 10 files changed, 15 insertions(+), 13 deletions(-) rename sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/{ => cpu}/ComputePoolCpuUsage.java (98%) rename sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/{ => cpu}/ComputePoolCpuUsageDetailSummaryEntry.java (92%) rename sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/{ => cpu}/CpuComputeResourceSummary.java (96%) rename sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/{ => cpu}/CpuUsageDetails.java (98%) diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolResourceSummary.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolResourceSummary.java index 9ef89e4f03..599517b74c 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolResourceSummary.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolResourceSummary.java @@ -23,6 +23,7 @@ import org.jclouds.tmrk.enterprisecloud.domain.Action; import org.jclouds.tmrk.enterprisecloud.domain.Link; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.Resource; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.CpuComputeResourceSummary; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsage.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsage.java similarity index 98% rename from sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsage.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsage.java index 5c1258c217..a0274ab795 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsage.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.tmrk.enterprisecloud.domain.resource; +package org.jclouds.tmrk.enterprisecloud.domain.resource.cpu; import org.jclouds.javax.annotation.Nullable; import org.jclouds.tmrk.enterprisecloud.domain.Action; @@ -27,7 +27,6 @@ import org.jclouds.tmrk.enterprisecloud.domain.internal.Resource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import java.net.URI; -import java.util.Collections; import java.util.Date; import java.util.Map; import java.util.Set; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsageDetailSummaryEntry.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsageDetailSummaryEntry.java similarity index 92% rename from sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsageDetailSummaryEntry.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsageDetailSummaryEntry.java index ffee7f30af..c59b9fae96 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/ComputePoolCpuUsageDetailSummaryEntry.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/ComputePoolCpuUsageDetailSummaryEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.tmrk.enterprisecloud.domain.resource; +package org.jclouds.tmrk.enterprisecloud.domain.resource.cpu; import org.jclouds.javax.annotation.Nullable; import org.jclouds.tmrk.enterprisecloud.domain.internal.ResourceCapacity; @@ -50,7 +50,7 @@ public class ComputePoolCpuUsageDetailSummaryEntry { private ResourceCapacity value; /** - * @see org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsageDetailSummaryEntry#getTime + * @see ComputePoolCpuUsageDetailSummaryEntry#getTime */ public Builder time(Date time) { this.time = time; @@ -58,7 +58,7 @@ public class ComputePoolCpuUsageDetailSummaryEntry { } /** - * @see org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsageDetailSummaryEntry#getValue + * @see ComputePoolCpuUsageDetailSummaryEntry#getValue */ public Builder value(ResourceCapacity value) { this.value = value; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuComputeResourceSummary.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuComputeResourceSummary.java similarity index 96% rename from sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuComputeResourceSummary.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuComputeResourceSummary.java index 06f6856eb5..707e8d8d23 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuComputeResourceSummary.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuComputeResourceSummary.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.tmrk.enterprisecloud.domain.resource; +package org.jclouds.tmrk.enterprisecloud.domain.resource.cpu; import org.jclouds.javax.annotation.Nullable; import org.jclouds.tmrk.enterprisecloud.domain.internal.ResourceCapacity; +import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputeResourceSummary; import javax.xml.bind.annotation.XmlElement; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuUsageDetails.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuUsageDetails.java similarity index 98% rename from sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuUsageDetails.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuUsageDetails.java index 3f67a3a52a..8727434727 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/CpuUsageDetails.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/resource/cpu/CpuUsageDetails.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.tmrk.enterprisecloud.domain.resource; +package org.jclouds.tmrk.enterprisecloud.domain.resource.cpu; import com.google.common.collect.Sets; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceAsyncClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceAsyncClient.java index 179fe80f37..4998fbbc0f 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceAsyncClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceAsyncClient.java @@ -22,7 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.*; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.ComputePoolCpuUsage; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummary; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummaryList; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClient.java index d3479e673f..a2f40e340c 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClient.java @@ -19,7 +19,7 @@ package org.jclouds.tmrk.enterprisecloud.features; import org.jclouds.concurrent.Timeout; -import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.ComputePoolCpuUsage; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummary; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummaryList; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClientLiveTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClientLiveTest.java index a84541b5d2..d45db881b5 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClientLiveTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/ResourceClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.tmrk.enterprisecloud.features; -import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.ComputePoolCpuUsage; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummary; import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummaryList; import org.testng.annotations.BeforeGroups; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolCpuUsageJAXBParsingTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolCpuUsageJAXBParsingTest.java index 16046fc14f..919d561bd6 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolCpuUsageJAXBParsingTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolCpuUsageJAXBParsingTest.java @@ -36,9 +36,9 @@ import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.tmrk.enterprisecloud.domain.Link; -import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage; -import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsageDetailSummaryEntry; -import org.jclouds.tmrk.enterprisecloud.domain.resource.CpuUsageDetails; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.ComputePoolCpuUsage; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.ComputePoolCpuUsageDetailSummaryEntry; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.CpuUsageDetails; import org.jclouds.tmrk.enterprisecloud.features.ResourceAsyncClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolResourceSummaryJAXBParsingTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolResourceSummaryJAXBParsingTest.java index fd95df388e..c5e372dc3b 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolResourceSummaryJAXBParsingTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/ComputePoolResourceSummaryJAXBParsingTest.java @@ -36,6 +36,7 @@ import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.tmrk.enterprisecloud.domain.internal.ResourceCapacity; import org.jclouds.tmrk.enterprisecloud.domain.resource.*; +import org.jclouds.tmrk.enterprisecloud.domain.resource.cpu.CpuComputeResourceSummary; import org.jclouds.tmrk.enterprisecloud.features.ResourceAsyncClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod;