Remove duplicate Utils getters

Rename callers as required.

blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java

@@ -122,12 +122,6 @@ public interface BlobStoreContext extends Closeable, View {
    @Deprecated
    ConsistencyModel getConsistencyModel();
 
-
-   Utils getUtils();
-
-   /**
-    * @see #getUtils
-    */
    Utils utils();
 
    /**

blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java

@@ -103,11 +103,6 @@ public AsyncBlobStore getAsyncBlobStore() {
       return ablobStore;
    }
 
-   @Override
-   public Utils getUtils() {
-      return utils();
-   }
-
    @Override
    public Utils utils() {
       return utils;

compute/src/main/java/org/jclouds/compute/ComputeServiceContext.java

@@ -37,11 +37,6 @@ public interface ComputeServiceContext extends Closeable, View {
 
    ComputeService getComputeService();
 
-   Utils getUtils();
-
-   /**
-    * @see #getUtils
-    */
    Utils utils();
 
    @Override

compute/src/main/java/org/jclouds/compute/internal/ComputeServiceContextImpl.java

@@ -58,11 +58,6 @@ public void close() {
       delegate().close();
    }
 
-   @Override
-   public Utils getUtils() {
-      return utils();
-   }
-
    @Override
    public Utils utils() {
       return utils;

core/src/main/java/org/jclouds/Context.java

@@ -61,11 +61,6 @@ public interface Context extends Location, Closeable {
     */
    String getIdentity();
 
-   Utils getUtils();
-
-   /**
-    * @see #getUtils
-    */
    Utils utils();
 
    /**

core/src/main/java/org/jclouds/internal/ContextImpl.java

@@ -98,14 +98,6 @@ public String getIdentity() {
       return creds.get().identity;
    }
 
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public Utils getUtils() {
-      return utils();
-   }
-
    @Override
    public Utils utils() {
       return utils;

core/src/main/java/org/jclouds/rest/Utils.java

@@ -60,119 +60,45 @@ public interface Utils {
     * </ul>
     */
    @Beta
-   Map<String, Credentials> getCredentialStore();
-
-   /**
-    * @see ComputeServiceContext#getCredentialStore
-    */
-   @Beta
    Map<String, Credentials> credentialStore();
-
-   Json getJson();
 
-   /**
-    * #see #getJson
-    */
    Json json();
 
    /**
     * 
     * @deprecated will be removed in jclouds 1.7, as async interfaces are no
     *             longer supported.
-    * @see #getHttpClient()
-    */
-   @Deprecated
-   HttpAsyncClient getHttpAsyncClient();
-
-   /**
-    * 
-    * @deprecated will be removed in jclouds 1.7, as async interfaces are no
-    *             longer supported.
-    * @see #http()
     */
    @Deprecated
    HttpAsyncClient asyncHttp();
 
-   HttpClient getHttpClient();
-
-   /**
-    * #see #getHttpClient
-    */
    HttpClient http();
 
-   Crypto getCrypto();
-
-   /**
-    * #see #getCrypto
-    */
    Crypto crypto();
 
-   DateService getDateService();
-
-   /**
-    * #see #getDateService
-    */
    DateService date();
 
    /**
     * @deprecated will be removed in jclouds 1.7, as async interfaces are no
     *             longer supported.
     */
    @Deprecated
-   ListeningExecutorService getUserExecutor();
-
-   /**
-    * #see #getUserExecutor
-    *
-    * @deprecated will be removed in jclouds 1.7, as async interfaces are no
-    *             longer supported.
-    */
-   @Deprecated
    ListeningExecutorService userExecutor();
 
    /**
     * @deprecated will be removed in jclouds 1.7, as async interfaces are no
     *             longer supported.
     */
    @Deprecated
-   ListeningExecutorService getIoExecutor();
-
-   /**
-    * #see #getIoExecutor
-    *
-    * @deprecated will be removed in jclouds 1.7, as async interfaces are no
-    *             longer supported.
-    */
-   @Deprecated
    ListeningExecutorService ioExecutor();
 
-   @Beta
-   EventBus getEventBus();
-
    EventBus eventBus();
 
-   LoggerFactory getLoggerFactory();
-
-   /**
-    * #see #getLoggerFactory
-    */
    LoggerFactory loggerFactory();
 
-
-   @Beta
-   Injector getInjector();
-
-   /**
-    * #see #getInjector
-    */
    @Beta
    Injector injector();
-
-   XMLParser getXml();
 
-   /**
-    * #see #getXml
-    */
    XMLParser xml();
 
 }

core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java

@@ -93,42 +93,11 @@ public Crypto crypto() {
       return encryption;
    }
 
-   @Override
-   public DateService getDateService() {
-      return date;
-   }
-
-   @Override
-   public Crypto getCrypto() {
-      return encryption;
-   }
-
-   @Override
-   @Deprecated
-   public org.jclouds.rest.HttpAsyncClient getHttpAsyncClient() {
-      return simpleAsyncClient;
-   }
-
-   @Override
-   public HttpClient getHttpClient() {
-      return simpleClient;
-   }
-
    @Override
    public HttpClient http() {
       return simpleClient;
    }
 
-   @Override
-   public ListeningExecutorService getIoExecutor() {
-      return ioExecutor;
-   }
-
-   @Override
-   public ListeningExecutorService getUserExecutor() {
-      return userExecutor;
-   }
-
    @Override
    public ListeningExecutorService ioExecutor() {
       return ioExecutor;
@@ -139,51 +108,25 @@ public ListeningExecutorService userExecutor() {
       return userExecutor;
    }
 
-   @Override
-   public EventBus getEventBus() {
-      return eventBus;
-   }
-
    @Override
    public EventBus eventBus() {
       return eventBus;
    }
-
-   @Override
-   public LoggerFactory getLoggerFactory() {
-      return loggerFactory;
-   }
 
    @Override
    public LoggerFactory loggerFactory() {
       return loggerFactory;
    }
 
-   @Override
-   public Json getJson() {
-      return json;
-   }
-
    @Override
    public Json json() {
       return json;
    }
 
-   @Override
-   @Beta
-   public Injector getInjector() {
-      return injector;
-   }
-
    @Override
    @Beta
    public Injector injector() {
-      return getInjector();
-   }
-
-   @Override
-   public XMLParser getXml() {
-      return xml;
+      return injector;
    }
 
    @Override
@@ -196,9 +139,4 @@ public Map<String, Credentials> credentialStore() {
       return credentialStore;
    }
 
-   @Override
-   public Map<String, Credentials> getCredentialStore() {
-      return credentialStore;
-   }
-
 }

drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java

@@ -22,7 +22,7 @@ public void testSocketOpenThrowsUnsupported() {
             .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));
    }
 }

loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContext.java

@@ -38,12 +38,6 @@ public interface LoadBalancerServiceContext extends Closeable, View {
 
    LoadBalancerService getLoadBalancerService();
 
-
-   Utils getUtils();
-
-   /**
-    * @see #getUtils
-    */
    Utils utils();
 
    @Override

loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java

@@ -54,11 +54,6 @@ public LoadBalancerService getLoadBalancerService() {
       return loadBalancerService;
    }
 
-   @Override
-   public Utils getUtils() {
-      return utils();
-   }
-
    @Override
    public Utils utils() {
       return utils;

providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java

@@ -48,11 +48,11 @@ public AWSEC2ImageExtensionLiveTest() {
 
    @Override
    protected Iterable<? extends Image> 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);