diff --git a/core/src/main/java/org/jclouds/rest/Utils.java b/core/src/main/java/org/jclouds/rest/Utils.java index 6104163d81..14c386eaef 100644 --- a/core/src/main/java/org/jclouds/rest/Utils.java +++ b/core/src/main/java/org/jclouds/rest/Utils.java @@ -60,6 +60,7 @@ public interface Utils { * */ @Beta + @Deprecated Map getCredentialStore(); /** @@ -68,6 +69,7 @@ public interface Utils { @Beta Map credentialStore(); + @Deprecated Json getJson(); /** @@ -93,6 +95,7 @@ public interface Utils { @Deprecated HttpAsyncClient asyncHttp(); + @Deprecated HttpClient getHttpClient(); /** @@ -100,6 +103,7 @@ public interface Utils { */ HttpClient http(); + @Deprecated Crypto getCrypto(); /** @@ -107,6 +111,7 @@ public interface Utils { */ Crypto crypto(); + @Deprecated DateService getDateService(); /** @@ -147,10 +152,12 @@ public interface Utils { ListeningExecutorService ioExecutor(); @Beta + @Deprecated EventBus getEventBus(); EventBus eventBus(); + @Deprecated LoggerFactory getLoggerFactory(); /** @@ -160,6 +167,7 @@ public interface Utils { @Beta + @Deprecated Injector getInjector(); /** @@ -168,6 +176,7 @@ public interface Utils { @Beta Injector injector(); + @Deprecated XMLParser getXml(); /** diff --git a/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java b/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java index 64ff091161..532fba66c2 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java @@ -22,7 +22,7 @@ public class GaeSocketOpenTest { .modules(ImmutableSet.of(new GoogleAppEngineConfigurationModule())) .build(); - SocketOpen socketOpen = context.getUtils().getInjector().getInstance(SocketOpen.class); + SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class); socketOpen.apply(HostAndPort.fromParts("localhost", 22)); } } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java index 7c4163ed27..d1940cfeb8 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java @@ -48,11 +48,11 @@ public class AWSEC2ImageExtensionLiveTest extends BaseImageExtensionLiveTest { @Override protected Iterable listImages() { - AWSEC2Client client = view.utils().getInjector().getInstance(AWSEC2Client.class); + AWSEC2Client client = view.utils().injector().getInstance(AWSEC2Client.class); String[] parts = AWSUtils.parseHandle(imageId); String region = parts[0]; String imageId = parts[1]; - EC2ImageParser parser = view.utils().getInjector().getInstance(EC2ImageParser.class); + EC2ImageParser parser = view.utils().injector().getInstance(EC2ImageParser.class); return transform( client.getAMIServices().describeImagesInRegion(region, new DescribeImagesOptions().imageIds(imageId)), parser);