From 1cf870731dc5a78830fddc9a70a654d2abd42cd8 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Thu, 17 Jul 2014 17:00:20 +0100 Subject: [PATCH 1/3] Fix use of deprecated Strings2.toString(InputSupplier) --- .../DataNonCDMIContentTypeApiLiveTest.java | 10 +++++----- .../handlers/CloudSigmaErrorHandler.java | 8 +------- .../docker/handlers/DockerErrorHandler.java | 18 +++++++----------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java index 7854018fe..e62652000 100644 --- a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java +++ b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java @@ -91,7 +91,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { dataNonCDMIContentTypeApi.create(dataObjectNameIn, value); payloadOut = dataNonCDMIContentTypeApi.getValue(dataObjectNameIn); assertNotNull(payloadOut); - assertEquals(Strings2.toString(payloadOut), value); + assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value); payloadIn = new StringPayload(value); payloadIn.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(payloadIn.getContentMetadata() @@ -100,7 +100,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { payloadOut = dataNonCDMIContentTypeApi.getValue(dataObjectNameIn); assertNotNull(payloadOut); - assertEquals(Strings2.toString(payloadOut), value); + assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value); dataObject = dataNonCDMIContentTypeApi.get(dataObjectNameIn, DataObjectQueryParams.Builder.field("parentURI")); assertNotNull(dataObject); @@ -140,7 +140,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { assertEquals(containerApi.get(containerName).getChildren().contains(dataObjectNameIn), true); payloadOut = dataNonCDMIContentTypeApi.getValue(dataObjectNameIn); assertNotNull(payloadOut); - assertEquals(Strings2.toString(payloadOut), value); + assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value); dataNonCDMIContentTypeApi.delete(dataObjectNameIn); assertEquals(containerApi.get(containerName).getChildren().contains(dataObjectNameIn), false); @@ -303,12 +303,12 @@ public void testCreateDataObjectsNonCDMI() throws Exception { payloadOut = dataNonCDMIContentTypeApi.getValue(dataObjectNameIn, "bytes=0-10"); assertNotNull(payloadOut); - assertEquals(Strings2.toString(payloadOut), value.substring(0, 11)); + assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value.substring(0, 11)); assertEquals(payloadOut.getContentMetadata().getContentLength(), new Long(11)); payloadOut = dataNonCDMIContentTypeApi.getValue(dataObjectNameIn, "bytes=11-20"); assertNotNull(payloadOut); - assertEquals(Strings2.toString(payloadOut), value.substring(11, 21)); + assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value.substring(11, 21)); assertEquals(payloadOut.getContentMetadata().getContentLength(), new Long(10)); dataNonCDMIContentTypeApi.delete(dataObjectNameIn); diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/handlers/CloudSigmaErrorHandler.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/handlers/CloudSigmaErrorHandler.java index 2095140ba..a2912e7ef 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/handlers/CloudSigmaErrorHandler.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/handlers/CloudSigmaErrorHandler.java @@ -94,15 +94,9 @@ public String parseMessage(HttpResponse response) { if (response.getPayload() == null) return null; try { - return Strings2.toString(response.getPayload()); + return Strings2.toStringAndClose(response.getPayload().openStream()); } catch (IOException e) { throw Throwables.propagate(e); - } finally { - try { - response.getPayload().getInput().close(); - } catch (IOException e) { - throw Throwables.propagate(e); - } } } } diff --git a/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java b/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java index 855f25fda..72d3069fb 100644 --- a/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java +++ b/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java @@ -16,8 +16,10 @@ */ package org.jclouds.docker.handlers; -import com.google.common.base.Throwables; -import com.google.common.io.Closeables; +import java.io.IOException; + +import javax.annotation.Resource; + import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpResponse; @@ -27,8 +29,8 @@ import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.util.Strings2; -import javax.annotation.Resource; -import java.io.IOException; +import com.google.common.base.Throwables; +import com.google.common.io.Closeables; /** * This will parse and set an appropriate exception on the command object. @@ -92,15 +94,9 @@ public String parseMessage(HttpResponse response) { if (response.getPayload() == null) return null; try { - return Strings2.toString(response.getPayload()); + return Strings2.toStringAndClose(response.getPayload().openStream()); } catch (IOException e) { throw Throwables.propagate(e); - } finally { - try { - response.getPayload().close(); - } catch (IOException e) { - throw Throwables.propagate(e); - } } } } From 61c249f1e912bf62a1563599dab84952e692b21a Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Thu, 17 Jul 2014 21:15:17 +0100 Subject: [PATCH 2/3] Remove deprecated Paylods.newPayload calls --- .../abiquo/fallbacks/MovedVolumeTest.java | 3 ++- .../ReturnTaskReferenceOrNullTest.java | 3 ++- .../AppendApiVersionToMediaTypeTest.java | 17 +++++++++-------- .../DataNonCDMIContentTypeApiLiveTest.java | 18 ++++++++++-------- .../codec/BlobStoreConversionsTest.java | 4 +++- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/abiquo/src/test/java/org/jclouds/abiquo/fallbacks/MovedVolumeTest.java b/abiquo/src/test/java/org/jclouds/abiquo/fallbacks/MovedVolumeTest.java index 66835e7f7..86ae00641 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/fallbacks/MovedVolumeTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/fallbacks/MovedVolumeTest.java @@ -34,6 +34,7 @@ import com.abiquo.server.core.infrastructure.storage.MovedVolumeDto; import com.abiquo.server.core.infrastructure.storage.VolumeManagementDto; +import com.google.common.io.ByteSource; import com.google.inject.TypeLiteral; /** @@ -66,7 +67,7 @@ public void testReturnVolume() throws Exception { HttpResponse response = EasyMock.createMock(HttpResponse.class); HttpResponseException exception = EasyMock.createMock(HttpResponseException.class); - Payload payload = Payloads.newPayload(xmlParser.toXML(movedRef)); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(xmlParser.toXML(movedRef).getBytes())); // Status code is called once expect(response.getStatusCode()).andReturn(Status.MOVED_PERMANENTLY.getStatusCode()); diff --git a/abiquo/src/test/java/org/jclouds/abiquo/functions/ReturnTaskReferenceOrNullTest.java b/abiquo/src/test/java/org/jclouds/abiquo/functions/ReturnTaskReferenceOrNullTest.java index 48ae6cf11..c2f07c8e4 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/functions/ReturnTaskReferenceOrNullTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/functions/ReturnTaskReferenceOrNullTest.java @@ -35,6 +35,7 @@ import com.abiquo.model.transport.AcceptedRequestDto; import com.google.common.base.Function; +import com.google.common.io.ByteSource; import com.google.inject.TypeLiteral; /** @@ -61,7 +62,7 @@ public void testReturnNullIfNoContent() { public void testReturnTaskIfAccepted() throws IOException { JAXBParser parser = new JAXBParser("false"); AcceptedRequestDto task = new AcceptedRequestDto(); - Payload payload = Payloads.newPayload(parser.toXML(task)); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(parser.toXML(task).getBytes())); Function> function = new ReturnTaskReferenceOrNull(parser, createTypeLiteral()); diff --git a/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java b/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java index 7dd454135..52402d5bb 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java @@ -32,6 +32,7 @@ import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; +import com.google.common.io.ByteSource; import com.google.common.net.HttpHeaders; /** @@ -114,7 +115,7 @@ public void testAppendVersionToPayloadHeadersWithoutPayload() { } public void testAppendVersionToPayloadHeadersWithStandardPayload() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/xml"); HttpRequest request = HttpRequest.builder().method("GET").endpoint(URI.create("http://foo")).payload(payload) @@ -129,7 +130,7 @@ public void testAppendVersionToPayloadHeadersWithStandardPayload() { } public void testAppendVersionToPayloadHeadersWithDefaultPayload() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); HttpRequest request = HttpRequest.builder().method("GET").endpoint(URI.create("http://foo")).payload(payload) .build(); @@ -143,7 +144,7 @@ public void testAppendVersionToPayloadHeadersWithDefaultPayload() { } public void testAppendVersionToPayloadHeadersWithVersionInPayload() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml;version=1.8.5"); HttpRequest request = HttpRequest.builder().method("GET").endpoint(URI.create("http://foo")).payload(payload) @@ -159,7 +160,7 @@ public void testAppendVersionToPayloadHeadersWithVersionInPayload() { } public void testAppendVersionToPayloadHeadersWithoutVersionInPayload() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml"); HttpRequest request = HttpRequest.builder().method("GET").endpoint(URI.create("http://foo")).payload(payload) @@ -175,7 +176,7 @@ public void testAppendVersionToPayloadHeadersWithoutVersionInPayload() { } public void testFilterWithAcceptAndContentTypeWithVersion() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml;version=2.1-SNAPSHOT"); Multimap headers = LinkedHashMultimap. create(); @@ -198,7 +199,7 @@ public void testFilterWithAcceptAndContentTypeWithVersion() { } public void testFilterWithAcceptAndContentTypeWithoutVersion() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml"); Multimap headers = LinkedHashMultimap. create(); @@ -221,7 +222,7 @@ public void testFilterWithAcceptAndContentTypeWithoutVersion() { } public void testFilterWithversionInAccept() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml"); Multimap headers = LinkedHashMultimap. create(); @@ -244,7 +245,7 @@ public void testFilterWithversionInAccept() { } public void testFilterWithversionInContentType() { - Payload payload = Payloads.newByteArrayPayload(new byte[] {}); + Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[0])); payload.getContentMetadata().setContentType("application/vnd.abiquo.racks+xml;version=1.8.5"); Multimap headers = LinkedHashMultimap. create(); diff --git a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java index e62652000..7851abd42 100644 --- a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java +++ b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java @@ -23,15 +23,15 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.nio.charset.Charset; import java.util.Map; import java.util.logging.Logger; import org.jclouds.io.Payload; +import org.jclouds.io.Payloads; import org.jclouds.io.payloads.BaseMutableContentMetadata; -import org.jclouds.io.payloads.ByteArrayPayload; import org.jclouds.io.payloads.FilePayload; import org.jclouds.io.payloads.InputStreamPayload; -import org.jclouds.io.payloads.StringPayload; import org.jclouds.snia.cdmi.v1.domain.Container; import org.jclouds.snia.cdmi.v1.domain.DataObject; import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiLiveTest; @@ -42,6 +42,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Maps; +import com.google.common.io.ByteSource; import com.google.common.io.Closeables; import com.google.common.io.Files; import com.google.common.net.MediaType; @@ -93,7 +94,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { assertNotNull(payloadOut); assertEquals(Strings2.toStringAndClose(payloadOut.openStream()), value); - payloadIn = new StringPayload(value); + payloadIn = newPayload(value); payloadIn.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(payloadIn.getContentMetadata() .toBuilder().contentType(MediaType.PLAIN_TEXT_UTF_8.toString()).build())); dataNonCDMIContentTypeApi.create(dataObjectNameIn, payloadIn); @@ -121,7 +122,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { // exercise create data object with none cdmi put with payload byte array. value = "Hello CDMI World non-cdmi byte array"; bytes = value.getBytes(Charsets.UTF_8); - payloadIn = new ByteArrayPayload(bytes); + payloadIn = Payloads.newByteSourcePayload(ByteSource.wrap(bytes)); payloadIn.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(payloadIn.getContentMetadata() .toBuilder().contentType(MediaType.PLAIN_TEXT_UTF_8.toString()).build())); dataNonCDMIContentTypeApi.create(dataObjectNameIn, payloadIn); @@ -296,7 +297,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { // exercise get with none cdmi get range. value = "Hello CDMI World non-cdmi String"; - payloadIn = new StringPayload(value); + payloadIn = newPayload(value); payloadIn.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(payloadIn.getContentMetadata() .toBuilder().contentType(MediaType.PLAIN_TEXT_UTF_8.toString()).build())); dataNonCDMIContentTypeApi.create(dataObjectNameIn, payloadIn); @@ -318,7 +319,7 @@ public void testCreateDataObjectsNonCDMI() throws Exception { // server does not actually support cdmi partial but // trace allows me to see that request was constructed properly value = "Hello CDMI World non-cdmi String"; - payloadIn = new StringPayload(value); + payloadIn = Payloads.newByteSourcePayload(ByteSource.wrap(value.getBytes(Charset.forName("UTF-8")))); payloadIn.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(payloadIn.getContentMetadata() .toBuilder().contentType(MediaType.PLAIN_TEXT_UTF_8.toString()).build())); dataNonCDMIContentTypeApi.createPartial(dataObjectNameIn, payloadIn); @@ -340,9 +341,10 @@ public void testCreateDataObjectsNonCDMI() throws Exception { } finally { tmpFileIn.delete(); containerApi.delete(containerName); - } - } + private Payload newPayload(String value) { + return Payloads.newByteSourcePayload(ByteSource.wrap(value.getBytes(Charset.forName("UTF-8")))); + } } diff --git a/jclouds-representations/representations-codec/src/test/java/org/jclouds/blobstore/codec/BlobStoreConversionsTest.java b/jclouds-representations/representations-codec/src/test/java/org/jclouds/blobstore/codec/BlobStoreConversionsTest.java index 32553f7f5..60148b436 100644 --- a/jclouds-representations/representations-codec/src/test/java/org/jclouds/blobstore/codec/BlobStoreConversionsTest.java +++ b/jclouds-representations/representations-codec/src/test/java/org/jclouds/blobstore/codec/BlobStoreConversionsTest.java @@ -17,6 +17,8 @@ package org.jclouds.blobstore.codec; import com.google.common.collect.ImmutableSet; +import com.google.common.io.ByteSource; + import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; @@ -61,7 +63,7 @@ void testToBlob() { blobStore.createContainerInLocation(null, "container"); blobStore.createDirectory("container", "one"); - blobStore.putBlob("container", blobStore.blobBuilder("myblob").payload("testcontent").build()); + blobStore.putBlob("container", blobStore.blobBuilder("myblob").payload(ByteSource.wrap("testcontent".getBytes())).build()); Blob representation = ToBlob.INSTANCE.apply(blobStore.getBlob("container", "myblob")); assertNotNull(representation); assertNotNull(representation.getBlobMetadata()); From 1bb86736049f5252e3cf623eba059dd311a4fb0a Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Thu, 17 Jul 2014 21:35:50 +0100 Subject: [PATCH 3/3] Fix minor compilation warnings --- .../cloudsigma2/binders/BindCreateSubscriptionRequestList.java | 2 +- .../java/org/jclouds/cloudsigma2/binders/BindDrivesToJson.java | 2 +- .../binders/BindFirewallPoliciesListToJsonRequest.java | 2 +- .../cloudsigma2/binders/BindServerInfoListToJsonRequest.java | 2 +- .../jclouds/cloudsigma2/binders/BindTagListToJsonRequest.java | 2 +- .../jclouds/cloudsigma2/binders/BindUuidStringsToJsonArray.java | 2 +- .../cloudsigma2/domain/DrivesListRequestFieldsGroup.java | 2 +- .../org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java | 2 +- .../compute/config/DockerComputeServiceContextModule.java | 1 + .../docker/compute/functions/ContainerToNodeMetadataTest.java | 1 - .../org/jclouds/docker/compute/functions/ImageToImageTest.java | 1 - .../org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java | 2 +- 12 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindCreateSubscriptionRequestList.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindCreateSubscriptionRequestList.java index b9375831b..17874789d 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindCreateSubscriptionRequestList.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindCreateSubscriptionRequestList.java @@ -43,7 +43,7 @@ public BindCreateSubscriptionRequestList(CreateSubscriptionRequestToJson subscri @Override public R bindToRequest(R request, Object input) { checkArgument(input instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(input); + List list = List.class.cast(input); for (Object o : list) { checkArgument(o instanceof CreateSubscriptionRequest, "this binder is only valid for List!"); diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindDrivesToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindDrivesToJson.java index f7c4b8509..1040da499 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindDrivesToJson.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindDrivesToJson.java @@ -42,7 +42,7 @@ public BindDrivesToJson(DriveToJson createDriveRequestToMap) { @Override public R bindToRequest(R request, Object payload) { checkArgument(payload instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(payload); + List list = List.class.cast(payload); for (Object o : list) { checkArgument(o instanceof DriveInfo, "this binder is only valid for List!"); } diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindFirewallPoliciesListToJsonRequest.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindFirewallPoliciesListToJsonRequest.java index 1e68f2886..4dd9b3ccb 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindFirewallPoliciesListToJsonRequest.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindFirewallPoliciesListToJsonRequest.java @@ -41,7 +41,7 @@ public BindFirewallPoliciesListToJsonRequest(FirewallPolicyToJson policyJsonObje @Override public R bindToRequest(R request, Object input) { checkArgument(input instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(input); + List list = List.class.cast(input); for (Object o : list) { checkArgument(o instanceof FirewallPolicy, "this binder is only valid for List!"); } diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindServerInfoListToJsonRequest.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindServerInfoListToJsonRequest.java index 4e5bc6026..9764a1155 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindServerInfoListToJsonRequest.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindServerInfoListToJsonRequest.java @@ -42,7 +42,7 @@ public BindServerInfoListToJsonRequest(ServerInfoToJson createServerInfoRequestT @Override public R bindToRequest(R request, Object payload) { checkArgument(payload instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(payload); + List list = List.class.cast(payload); for (Object o : list) { checkArgument(o instanceof ServerInfo, "this binder is only valid for List!"); } diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindTagListToJsonRequest.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindTagListToJsonRequest.java index c6bfb1b65..36d8beefa 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindTagListToJsonRequest.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindTagListToJsonRequest.java @@ -42,7 +42,7 @@ public BindTagListToJsonRequest(TagToJson tagJsonObjectFunction) { @Override public R bindToRequest(R request, Object payload) { checkArgument(payload instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(payload); + List list = List.class.cast(payload); for (Object o : list) { checkArgument(o instanceof Tag, "this binder is only valid for List!"); } diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindUuidStringsToJsonArray.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindUuidStringsToJsonArray.java index 3a960121d..80ba1ae02 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindUuidStringsToJsonArray.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/binders/BindUuidStringsToJsonArray.java @@ -32,7 +32,7 @@ public class BindUuidStringsToJsonArray implements Binder { @Override public R bindToRequest(R request, Object payload) { checkArgument(payload instanceof List, "this binder is only valid for List!"); - List list = List.class.cast(payload); + List list = List.class.cast(payload); for (Object o : list) { checkArgument(o instanceof String, "this binder is only valid for List!"); } diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java index 5b4c80797..9d1e1135e 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java @@ -33,7 +33,7 @@ public Iterable getFields() { public String toString() { String returnString = ""; - Iterator iterator = fields.iterator(); + Iterator iterator = fields.iterator(); while (iterator.hasNext()) { returnString += iterator.next(); diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java index 763e58b1d..23697d2c4 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java @@ -52,7 +52,7 @@ public int hashCode() { public String toString() { String returnString = ""; - Iterator iterator = uuids.iterator(); + Iterator iterator = uuids.iterator(); while (iterator.hasNext()) { returnString += iterator.next(); diff --git a/docker/src/main/java/org/jclouds/docker/compute/config/DockerComputeServiceContextModule.java b/docker/src/main/java/org/jclouds/docker/compute/config/DockerComputeServiceContextModule.java index b1cfee2da..063d6c9e8 100644 --- a/docker/src/main/java/org/jclouds/docker/compute/config/DockerComputeServiceContextModule.java +++ b/docker/src/main/java/org/jclouds/docker/compute/config/DockerComputeServiceContextModule.java @@ -37,6 +37,7 @@ public class DockerComputeServiceContextModule extends ComputeServiceAdapterContextModule { + @SuppressWarnings("unchecked") @Override protected void configure() { super.configure(); diff --git a/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java b/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java index 62a7943ff..f7a3b5763 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadataTest.java @@ -187,7 +187,6 @@ public void testVirtualMachineToNodeMetadata() { assertEquals(node.getPublicAddresses().size(), 1); } - @SuppressWarnings("unchecked") private Container mockContainer() { Container mockContainer = EasyMock.createMock(Container.class); diff --git a/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java b/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java index f295a3835..e9754d010 100644 --- a/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java +++ b/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java @@ -60,7 +60,6 @@ public void testImageToImage() { assertEquals(mockImage.getId(), image.getId().toString()); } - @SuppressWarnings("unchecked") private org.jclouds.docker.domain.Image mockImage() { org.jclouds.docker.domain.Image mockImage = EasyMock.createMock(org.jclouds.docker.domain.Image.class); diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java index a325be2df..362b9854e 100644 --- a/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java +++ b/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java @@ -131,7 +131,7 @@ public void setupContext() { // try and get a master from the cache, this will initialize the config/download isos and // prepare everything IF a master is not available, subsequent calls should be pretty fast Template template = view.getComputeService().templateBuilder().build(); - checkNotNull(mastersCache.apply(template.getImage())); + checkNotNull(mastersCache.getUnchecked(template.getImage())); masterName = VIRTUALBOX_IMAGE_PREFIX + template.getImage().getId(); isosDir = workingDir + File.separator + "isos";