vbox: switched out use of host, as there's no useful data

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/compute/VirtualBoxComputeServiceAdapter.java

@@ -21,19 +21,27 @@
 
 package org.jclouds.virtualbox.compute;
 
-import com.google.common.base.Throwables;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.inject.Singleton;
-import org.jclouds.compute.ComputeServiceAdapter;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.domain.Credentials;
-import org.jclouds.virtualbox.domain.Host;
-import org.virtualbox_4_1.*;
 
-import javax.inject.Inject;
 import java.util.Collections;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.inject.Inject;
+
+import org.jclouds.compute.ComputeServiceAdapter;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.domain.Credentials;
+import org.jclouds.domain.Location;
+import org.jclouds.location.suppliers.JustProvider;
+import org.virtualbox_4_1.CleanupMode;
+import org.virtualbox_4_1.IMachine;
+import org.virtualbox_4_1.IProgress;
+import org.virtualbox_4_1.ISession;
+import org.virtualbox_4_1.SessionState;
+import org.virtualbox_4_1.VirtualBoxManager;
+
+import com.google.common.base.Throwables;
+import com.google.inject.Singleton;
 
 /**
  * Defines the connection between the {@link org.virtualbox_4_1.VirtualBoxManager} implementation and the jclouds
@@ -42,13 +50,15 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * @author Mattias Holmqvist, Andrea Turli
  */
 @Singleton
-public class VirtualBoxComputeServiceAdapter implements ComputeServiceAdapter<IMachine, IMachine, IMachine, Host> {
+public class VirtualBoxComputeServiceAdapter implements ComputeServiceAdapter<IMachine, IMachine, IMachine, Location> {
 
 	private final VirtualBoxManager manager;
+   private final JustProvider justProvider;
 
 	@Inject
-	public VirtualBoxComputeServiceAdapter(VirtualBoxManager manager) {
+	public VirtualBoxComputeServiceAdapter(VirtualBoxManager manager, JustProvider justProvider) {
 		this.manager = checkNotNull(manager, "manager");
+      this.justProvider = checkNotNull(justProvider, "justProvider");
 	}
 
 	@Override
@@ -71,9 +81,10 @@ public class VirtualBoxComputeServiceAdapter implements ComputeServiceAdapter<IM
 		return manager.getVBox().getMachines();
 	}
 
-	@Override
+	@SuppressWarnings("unchecked")
-	public Iterable<Host> listLocations() {
+   @Override
-		return Collections.emptyList();
+	public Iterable<Location> listLocations() {
+      return (Iterable<Location>) justProvider.get();
 	}
 
 	@Override

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/config/VirtualBoxComputeServiceContextModule.java

@@ -21,23 +21,26 @@
 
 package org.jclouds.virtualbox.config;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.net.URI;
-import com.google.common.base.Function;
+import java.util.Map;
-import com.google.common.base.Supplier;
+
-import com.google.common.collect.ImmutableMap;
+import javax.inject.Named;
-import com.google.inject.Injector;
+import javax.inject.Singleton;
-import com.google.inject.Provides;
+
-import com.google.inject.TypeLiteral;
 import org.jclouds.Constants;
 import org.jclouds.compute.ComputeServiceAdapter;
 import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
-import org.jclouds.compute.domain.*;
+import org.jclouds.compute.domain.Hardware;
+import org.jclouds.compute.domain.Image;
+import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.domain.NodeState;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.domain.Location;
+import org.jclouds.functions.IdentityFunction;
 import org.jclouds.location.Provider;
 import org.jclouds.location.suppliers.OnlyLocationOrFirstZone;
 import org.jclouds.virtualbox.compute.VirtualBoxComputeServiceAdapter;
-import org.jclouds.virtualbox.domain.Host;
-import org.jclouds.virtualbox.functions.HostToLocation;
 import org.jclouds.virtualbox.functions.IMachineToHardware;
 import org.jclouds.virtualbox.functions.IMachineToImage;
 import org.jclouds.virtualbox.functions.IMachineToNodeMetadata;
@@ -45,15 +48,18 @@ import org.virtualbox_4_1.IMachine;
 import org.virtualbox_4_1.MachineState;
 import org.virtualbox_4_1.VirtualBoxManager;
 
-import javax.inject.Named;
+import com.google.common.annotations.VisibleForTesting;
-import javax.inject.Singleton;
+import com.google.common.base.Function;
-import java.net.URI;
+import com.google.common.base.Supplier;
-import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.TypeLiteral;
 
 /**
  * @author Mattias Holmqvist, Andrea Turli
  */
-public class VirtualBoxComputeServiceContextModule extends ComputeServiceAdapterContextModule<VirtualBoxManager, VirtualBoxManager, IMachine, IMachine, IMachine, Host> {
+public class VirtualBoxComputeServiceContextModule extends ComputeServiceAdapterContextModule<VirtualBoxManager, VirtualBoxManager, IMachine, IMachine, IMachine, Location> {
 
    public VirtualBoxComputeServiceContextModule() {
       super(VirtualBoxManager.class, VirtualBoxManager.class);
@@ -68,15 +74,16 @@ public class VirtualBoxComputeServiceContextModule extends ComputeServiceAdapter
        return manager;
    }
 
+   @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    protected void configure() {
       super.configure();
-      bind(new TypeLiteral<ComputeServiceAdapter<IMachine, IMachine, IMachine, Host>>() {
+      bind(new TypeLiteral<ComputeServiceAdapter<IMachine, IMachine, IMachine, Location>>() {
       }).to(VirtualBoxComputeServiceAdapter.class);
       bind(new TypeLiteral<Function<IMachine, NodeMetadata>>() {
       }).to(IMachineToNodeMetadata.class);
-      bind(new TypeLiteral<Function<Host, Location>>() {
+      bind(new TypeLiteral<Function<Location, Location>>() {
-      }).to(HostToLocation.class);
+      }).to((Class) IdentityFunction.class);
       bind(new TypeLiteral<Function<IMachine, Hardware>>() {
       }).to(IMachineToHardware.class);
       bind(new TypeLiteral<Function<IMachine, Image>>() {

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/domain/Host.java

@@ -1,25 +0,0 @@
-/*
- * *
- *  * Licensed to jclouds, Inc. (jclouds) under one or more
- *  * contributor license agreements.  See the NOTICE file
- *  * distributed with this work for additional information
- *  * regarding copyright ownership.  jclouds licenses this file
- *  * to you under the Apache License, Version 2.0 (the
- *  * "License"); you may not use this file except in compliance
- *  * with the License.  You may obtain a copy of the License at
- *  *
- *  *   http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing,
- *  * software distributed under the License is distributed on an
- *  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  * KIND, either express or implied.  See the License for the
- *  * specific language governing permissions and limitations
- *  * under the License.
- *
- */
-
-package org.jclouds.virtualbox.domain;
-
-public class Host {
-}

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/HostToLocation.java

@@ -1,36 +0,0 @@
-/*
- * *
- *  * Licensed to jclouds, Inc. (jclouds) under one or more
- *  * contributor license agreements.  See the NOTICE file
- *  * distributed with this work for additional information
- *  * regarding copyright ownership.  jclouds licenses this file
- *  * to you under the Apache License, Version 2.0 (the
- *  * "License"); you may not use this file except in compliance
- *  * with the License.  You may obtain a copy of the License at
- *  *
- *  *   http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing,
- *  * software distributed under the License is distributed on an
- *  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  * KIND, either express or implied.  See the License for the
- *  * specific language governing permissions and limitations
- *  * under the License.
- *
- */
-
-package org.jclouds.virtualbox.functions;
-
-import com.google.common.base.Function;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.virtualbox.domain.Host;
-
-public class HostToLocation implements Function<Host, Location> {
-   @Override
-   public Location apply(@Nullable Host input) {
-      LocationBuilder locationBuilder = new LocationBuilder();
-      return locationBuilder.build();
-   }
-}