Cleaning up deprecation warnings Also setting 1.6 as the target Java version
Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/ac12a075 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/ac12a075 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/ac12a075 Branch: refs/heads/up-to-1.8.x Commit: ac12a075c515ef66fea2b3733975f75b69f3fe25 Parents: 53b7e0f Author: Andrew Phillips <[email protected]> Authored: Sat Oct 18 16:07:21 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Sat Oct 18 16:20:12 2014 -0400 ---------------------------------------------------------------------- blobstore-basics/pom.xml | 13 ++++-- .../examples/blobstore/basics/MainApp.java | 45 +++++++++----------- blobstore-largeblob/pom.xml | 9 ++++ .../examples/blobstore/largeblob/MainApp.java | 3 +- google/pom.xml | 14 ++++++ rackspace/pom.xml | 14 ++++++ .../rackspace/cloudfiles/GenerateTempURL.java | 3 -- .../cloudfiles/UploadDirectoryToCDN.java | 1 - .../rackspace/cloudqueues/ProducerConsumer.java | 2 +- .../rackspace/cloudqueues/PublishSubscribe.java | 2 +- .../cloudservers/CloudServersPublish.java | 2 +- .../rackspace/cloudservers/CreateServer.java | 2 +- 12 files changed, 73 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/blobstore-basics/pom.xml ---------------------------------------------------------------------- diff --git a/blobstore-basics/pom.xml b/blobstore-basics/pom.xml index b26684d..043b6b5 100644 --- a/blobstore-basics/pom.xml +++ b/blobstore-basics/pom.xml @@ -55,7 +55,15 @@ <build> <finalName>${project.artifactId}</finalName> <plugins> - + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -68,7 +76,6 @@ </archive> </configuration> </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2.1</version> @@ -93,7 +100,5 @@ </executions> </plugin> </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java ---------------------------------------------------------------------- diff --git a/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java b/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java index c520fe9..186051c 100755 --- a/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java +++ b/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java @@ -26,20 +26,20 @@ import java.util.Set; import org.jclouds.ContextBuilder; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; -import org.jclouds.atmos.AtmosAsyncClient; +import org.jclouds.atmos.AtmosApiMetadata; import org.jclouds.atmos.AtmosClient; -import org.jclouds.azureblob.AzureBlobAsyncClient; +import org.jclouds.azureblob.AzureBlobApiMetadata; import org.jclouds.azureblob.AzureBlobClient; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.StorageMetadata; -import org.jclouds.openstack.swift.SwiftAsyncClient; +import org.jclouds.openstack.swift.SwiftApiMetadata; import org.jclouds.openstack.swift.SwiftClient; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.Providers; import org.jclouds.rest.RestContext; -import org.jclouds.s3.S3AsyncClient; +import org.jclouds.s3.S3ApiMetadata; import org.jclouds.s3.S3Client; import com.google.common.base.Charsets; @@ -47,7 +47,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.io.ByteSource; -import com.google.inject.Module; /** * Demonstrates the use of {@link BlobStore}. @@ -111,25 +110,23 @@ public class MainApp { blobStore.putBlob(containerName, blob); // Use Provider API - if (context.getBackendType().getRawType().equals(RestContext.class)) { - RestContext<?, ?> rest = context.unwrap(); - Object object = null; - if (rest.getApi() instanceof S3Client) { - RestContext<S3Client, S3AsyncClient> providerContext = context.unwrap(); - object = providerContext.getApi().headObject(containerName, blobName); - } else if (rest.getApi() instanceof SwiftClient) { - RestContext<SwiftClient, SwiftAsyncClient> providerContext = context.unwrap(); - object = providerContext.getApi().getObjectInfo(containerName, blobName); - } else if (rest.getApi() instanceof AzureBlobClient) { - RestContext<AzureBlobClient, AzureBlobAsyncClient> providerContext = context.unwrap(); - object = providerContext.getApi().getBlobProperties(containerName, blobName); - } else if (rest.getApi() instanceof AtmosClient) { - RestContext<AtmosClient, AtmosAsyncClient> providerContext = context.unwrap(); - object = providerContext.getApi().headFile(containerName + "/" + blobName); - } - if (object != null) { - System.out.println(object); - } + ApiMetadata apiMetadata = context.unwrap().getProviderMetadata().getApiMetadata(); + Object object = null; + if (apiMetadata instanceof S3ApiMetadata) { + S3Client api = context.unwrapApi(S3Client.class); + object = api.headObject(containerName, blobName); + } else if (apiMetadata instanceof SwiftApiMetadata) { + SwiftClient api = context.unwrapApi(SwiftClient.class); + object = api.getObjectInfo(containerName, blobName); + } else if (apiMetadata instanceof AzureBlobApiMetadata) { + RestContext<AzureBlobClient, ?> providerContext = context.unwrap(); + object = providerContext.getApi().getBlobProperties(containerName, blobName); + } else if (apiMetadata instanceof AtmosApiMetadata) { + AtmosClient api = context.unwrapApi(AtmosClient.class); + object = api.headFile(containerName + "/" + blobName); + } + if (object != null) { + System.out.println(object); } } finally { http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/blobstore-largeblob/pom.xml ---------------------------------------------------------------------- diff --git a/blobstore-largeblob/pom.xml b/blobstore-largeblob/pom.xml index 66a0727..377a6dd 100644 --- a/blobstore-largeblob/pom.xml +++ b/blobstore-largeblob/pom.xml @@ -77,6 +77,15 @@ <finalName>${project.artifactId}</finalName> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> <configuration> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/blobstore-largeblob/src/main/java/org/jclouds/examples/blobstore/largeblob/MainApp.java ---------------------------------------------------------------------- diff --git a/blobstore-largeblob/src/main/java/org/jclouds/examples/blobstore/largeblob/MainApp.java b/blobstore-largeblob/src/main/java/org/jclouds/examples/blobstore/largeblob/MainApp.java index 8d7e6dd..a59fb10 100755 --- a/blobstore-largeblob/src/main/java/org/jclouds/examples/blobstore/largeblob/MainApp.java +++ b/blobstore-largeblob/src/main/java/org/jclouds/examples/blobstore/largeblob/MainApp.java @@ -42,6 +42,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.Providers; import com.google.common.collect.ImmutableSet; +import com.google.common.io.Files; import com.google.inject.Module; /** @@ -149,7 +150,7 @@ public class MainApp { File input = new File(fileName); long length = input.length(); // Add a Blob - Blob blob = blobStore.blobBuilder(objectName).payload(input) + Blob blob = blobStore.blobBuilder(objectName).payload(Files.asByteSource(input)) .contentType(MediaType.APPLICATION_OCTET_STREAM).contentDisposition(objectName).build(); // Upload a file String eTag = blobStore.putBlob(containerName, blob, multipart()); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/google/pom.xml ---------------------------------------------------------------------- diff --git a/google/pom.xml b/google/pom.xml index f8c6fae..af32cb6 100644 --- a/google/pom.xml +++ b/google/pom.xml @@ -51,4 +51,18 @@ <version>${jclouds.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index 4264d08..5491397 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -130,4 +130,18 @@ <version>5.1.25</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java index f0e7f03..4470450 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java @@ -25,7 +25,6 @@ import static org.jclouds.examples.rackspace.cloudfiles.Constants.REGION; import java.io.Closeable; import java.io.File; import java.io.IOException; -import java.util.Set; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; @@ -38,10 +37,8 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; -import org.jclouds.location.predicates.LocationPredicates; import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext; -import com.google.common.collect.Sets; import com.google.common.io.ByteSource; import com.google.common.io.Closeables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java index 98eb2b1..c6535f6 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java @@ -19,7 +19,6 @@ package org.jclouds.examples.rackspace.cloudfiles; import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.io.ByteSource; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java index 69c97b8..c39656a 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java @@ -113,7 +113,7 @@ public class ProducerConsumer implements Closeable { executorService.execute(new Consumer("1")); executorService.execute(new Consumer("2")); - Future producerFuture = executorService.submit(new Producer("1")); + Future<?> producerFuture = executorService.submit(new Producer("1")); producerFuture.get(); executorService.shutdown(); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java index f4b4e1b..3a4855a 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java @@ -112,7 +112,7 @@ public class PublishSubscribe implements Closeable { executorService.execute(new Subscriber("1")); executorService.execute(new Subscriber("2")); - Future publisherFuture = executorService.submit(new Publisher("1")); + Future<?> publisherFuture = executorService.submit(new Publisher("1")); publisherFuture.get(); executorService.shutdown(); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java index e3a19e0..8a32979 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java @@ -158,7 +158,7 @@ public class CloudServersPublish implements Closeable { computeService.runScriptOnNode(nodeMetadata.getId(), script, options); System.out.format(" Login: ssh %s@%s%n", nodeMetadata.getCredentials().getUser(), publicAddress); - System.out.format(" Password: %s%n", nodeMetadata.getCredentials().getPassword()); + System.out.format(" Password: %s%n", nodeMetadata.getCredentials().getOptionalPassword().get()); System.out.format(" Go to http://%s%n";, publicAddress); } } http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/ac12a075/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java index 715d91b..6f40d37 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java @@ -109,7 +109,7 @@ public class CreateServer implements Closeable { System.out.format(" %s%n", nodeMetadata); System.out.format(" Login: ssh %s@%s%n", nodeMetadata.getCredentials().getUser(), publicAddress); - System.out.format(" Password: %s%n", nodeMetadata.getCredentials().getPassword()); + System.out.format(" Password: %s%n", nodeMetadata.getCredentials().getOptionalPassword().get()); } /**
