You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/12/23 05:26:45 UTC
[21/51] [partial] stratos git commit: dropping jclouds 1.8.0 clone
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
deleted file mode 100644
index ab80fb5..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.Instance;
-import org.jclouds.googlecomputeengine.domain.InstanceTemplate;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.functions.internal.ParseInstances;
-import org.jclouds.googlecomputeengine.handlers.InstanceBinder;
-import org.jclouds.googlecomputeengine.handlers.MetadataBinder;
-import org.jclouds.googlecomputeengine.options.AttachDiskOptions;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-/**
- * Provides access to Instances via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/instances"/>
- * @see InstanceApi
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface InstanceApi {
-
- /**
- * Returns the specified instance resource.
- *
- * @param zone zone the instance is in.
- * @param instanceName name of the instance resource to return.
- * @return an Instance resource
- */
- @Named("Instances:get")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Instance getInZone(@PathParam("zone") String zone, @PathParam("instance") String instanceName);
-
- /**
- * Creates a instance resource in the specified project using the data included in the request.
- *
- *
- * @param instanceName this name of the instance to be created
- * @param zone the name of the zone where the instance will be created
- * @param template the instance template
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Instances:insert")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes({COMPUTE_SCOPE})
- @MapBinder(InstanceBinder.class)
- Operation createInZone(@PayloadParam("name") String instanceName, @PathParam("zone") String zone,
- @PayloadParam("template") InstanceTemplate template);
-
-
- /**
- * Deletes the specified instance resource.
- *
- * @param zone the instance is in.
- * @param instanceName name of the instance resource to delete.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field. If the instance did not exist the result is null.
- */
- @Named("Instances:delete")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation deleteInZone(@PathParam("zone") String zone, @PathParam("instance") String instanceName);
-
- /**
- * A paged version of InstanceApi#listInZone()
- *
- * @param zone zone instances are in
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see PagedIterable
- * @see InstanceApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Instances:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseInstances.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Instance> listFirstPageInZone(@PathParam("zone") String zone);
-
- /**
- * Retrieves the list of instance resources available to the specified project.
- * By default the list as a maximum size of 100, if no options are provided or ListOptions#getMaxResults() has not
- * been set.
- *
- * @param zone zone instances are in
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the list
- * @see ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("Instances:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseInstances.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Instance> listAtMarkerInZone(@PathParam("zone") String zone, @Nullable String marker,
- ListOptions listOptions);
-
- /**
- * @see InstanceApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Instances:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseInstances.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Instance> listAtMarkerInZone(@PathParam("zone") String zone,
- @Nullable String marker);
-
- /**
- * @see InstanceApi#listInZone(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Instances:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseInstances.class)
- @Transform(ParseInstances.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Instance> listInZone(@PathParam("zone") String zone);
-
- /**
- * @see InstanceApi#listInZone(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Instances:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseInstances.class)
- @Transform(ParseInstances.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Instance> listInZone(@PathParam("zone") String zone, ListOptions options);
-
- /**
- * Adds an access config to an instance's network interface.
- *
- * @param zone zone instance is in
- * @param instanceName the instance name.
- * @param accessConfig the AccessConfig to add.
- * @param networkInterfaceName network interface name.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Instances:addAccessConfig")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/addAccessConfig")
- @OAuthScopes({COMPUTE_SCOPE})
- Operation addAccessConfigToNicInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @BinderParam(BindToJsonPayload.class)
- Instance.NetworkInterface.AccessConfig accessConfig,
- @QueryParam("network_interface") String networkInterfaceName);
-
- /**
- * Deletes an access config from an instance's network interface.
- *
- * @param zone zone instance is in
- * @param instanceName the instance name.
- * @param accessConfigName the name of the access config to delete
- * @param networkInterfaceName network interface name.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Instances:deleteAccessConfig")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/deleteAccessConfig")
- @OAuthScopes(COMPUTE_SCOPE)
- Operation deleteAccessConfigFromNicInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @QueryParam("access_config") String accessConfigName,
- @QueryParam("network_interface") String networkInterfaceName);
-
- /**
- * Returns the specified instance's serial port output.
- *
- * @param zone zone instance is in
- * @param instanceName the instance name.
- * @return if successful, this method returns a SerialPortOutput containing the instance's serial output.
- */
- @Named("Instances:serialPort")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/serialPort")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- Instance.SerialPortOutput getSerialPortOutputInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName);
-
- /**
- * Hard-resets the instance.
- *
- * @param zone the zone the instance is in
- * @param instanceName the instance name
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field. If the instance did not exist the result is null.
- */
- @Named("Instances:reset")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/reset")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation resetInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName);
-
- /**
- * Attaches a disk to an instance
- *
- * @param zone The zone the instance is in.
- * @param instanceName The instance name to attach to
- * @param attachDiskOptions The options for attaching the disk.
- *
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Instances:attachDisk")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/attachDisk")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation attachDiskInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @BinderParam(BindToJsonPayload.class) AttachDiskOptions attachDiskOptions);
-
- /**
- * Detaches an attached disk from an instance
- *
- * @param zone The zone the instance is in.
- * @param instanceName The instance name to attach to
- * @param deviceName The device name of the disk to detach.
- *
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Instances:detachDisk")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/zones/{zone}/instances/{instance}/detachDisk")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation detachDiskInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @QueryParam("deviceName") String deviceName);
-
- /**
- * Sets metadata for an instance using the data included in the request.
- * <p/>
- * NOTE: This *sets* metadata items on the project (vs *adding* items to metadata),
- * if there are pre-existing metadata items that must be kept these must be fetched first and then re-set on the
- * new Metadata, e.g.
- * <pre><tt>
- * Metadata.Builder current = instanceApi.getInZone("us-central1-a", "myInstance").getMetadata().toBuilder();
- * current.addItem("newItem","newItemValue");
- * instanceApi.setMetadataInZone("us-central1-a", "myInstance", current.build());
- * </tt></pre>
- *
- * @param zone The zone the instance is in
- * @param instanceName The name of the instance
- * @param metadata the metadata to set
- * @param fingerprint The current fingerprint for the items
- *
- * @return an Operations resource. To check on the status of an operation, poll the Operations resource returned
- * to you, and look for the status field.
- */
- @Named("Instances:setMetadata")
- @POST
- @Path("/zones/{zone}/instances/{instance}/setMetadata")
- @OAuthScopes(COMPUTE_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @MapBinder(MetadataBinder.class)
- @Nullable
- Operation setMetadataInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @PayloadParam("items") Map<String, String> metadata,
- @PayloadParam("fingerprint") String fingerprint);
-
- /**
- * Sets items for an instance
- *
- * @param zone The zone the instance is in
- * @param instanceName the name of the instance
- * @param items A set of items
- * @param fingerprint The current fingerprint for the items
- * @return an Operations resource. To check on the status of an operation, poll the Operations resource returned
- * to you, and look for the status field.
- */
- @Named("Instances:setTags")
- @POST
- @Path("/zones/{zone}/instances/{instance}/setTags")
- @OAuthScopes(COMPUTE_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @MapBinder(BindToJsonPayload.class)
- @Nullable
- Operation setTagsInZone(@PathParam("zone") String zone,
- @PathParam("instance") String instanceName,
- @PayloadParam("items") Set<String> items,
- @PayloadParam("fingerprint") String fingerprint);
-
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java
deleted file mode 100644
index e88362b..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.MachineType;
-import org.jclouds.googlecomputeengine.functions.internal.ParseMachineTypes;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to MachineTypes via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/machineTypes"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface MachineTypeApi {
-
- /**
- * Returns the specified machine type resource
- *
- * @param zone the name of the zone the machine type is in
- * @param machineTypeName name of the machine type resource to return.
- * @return If successful, this method returns a MachineType resource
- */
- @Named("MachineTypes:get")
- @GET
- @Path("/zones/{zone}/machineTypes/{machineType}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- MachineType getInZone(@PathParam("zone") String zone, @PathParam("machineType") String machineTypeName);
-
- /**
- * @see MachineTypeApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("MachineTypes:list")
- @GET
- @Path("/zones/{zone}/machineTypes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseMachineTypes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<MachineType> listFirstPageInZone(@PathParam("zone") String zone);
-
- /**
- * @see MachineTypeApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("MachineTypes:list")
- @GET
- @Path("/zones/{zone}/machineTypes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseMachineTypes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<MachineType> listAtMarkerInZone(@PathParam("zone") String zone, @QueryParam("pageToken") @Nullable String marker);
-
- /**
- * Retrieves the list of machine type resources available to the specified project.
- * By default the list as a maximum size of 100, if no options are provided or ListOptions#getMaxResults() has not
- * been set.
- *
- * @param zone The name of the zone to list in.
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the list
- * @see ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("MachineTypes:list")
- @GET
- @Path("/zones/{zone}/machineTypes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseMachineTypes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<MachineType> listAtMarkerInZone(@PathParam("zone") String zone,
- @QueryParam("pageToken") @Nullable String marker,
- ListOptions listOptions);
-
- /**
- * @see MachineTypeApi#listInZone(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("MachineTypes:list")
- @GET
- @Path("/zones/{zone}/machineTypes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseMachineTypes.class)
- @Transform(ParseMachineTypes.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<MachineType> listInZone(@PathParam("zone") String zone);
-
- /**
- * A paged version of MachineTypeApi#listInZone(String)
- *
- * @param zone the zone to list in
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see PagedIterable
- * @see MachineTypeApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("MachineTypes:list")
- @GET
- @Path("/zones/{zone}/machineTypes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseMachineTypes.class)
- @Transform(ParseMachineTypes.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<MachineType> listInZone(@PathParam("zone") String zone, ListOptions listOptions);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java
deleted file mode 100644
index 82fe8e2..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Network;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.functions.internal.ParseNetworks;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-/**
- * Provides access to Networks via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/networks"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface NetworkApi {
-
- /**
- * Returns the specified persistent network resource.
- *
- * @param networkName name of the persistent network resource to return.
- * @return a Network resource.
- */
- @Named("Networks:get")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks/{network}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- Network get(@PathParam("network") String networkName);
-
- /**
- * Creates a persistent network resource in the specified project with the specified range.
- *
- * @param networkName the network name
- * @param IPv4Range the range of the network to be inserted.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Networks:insert")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes({COMPUTE_SCOPE})
- @MapBinder(BindToJsonPayload.class)
- Operation createInIPv4Range(@PayloadParam("name") String networkName,
- @PayloadParam("IPv4Range") String IPv4Range);
-
- /**
- * Creates a persistent network resource in the specified project with the specified range and specified gateway.
- *
- * @param networkName the network name
- * @param IPv4Range the range of the network to be inserted.
- * @param gatewayIPv4 the range of the network to be inserted.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Networks:insert")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes({COMPUTE_SCOPE})
- @MapBinder(BindToJsonPayload.class)
- Operation createInIPv4RangeWithGateway(@PayloadParam("name") String networkName,
- @PayloadParam("IPv4Range") String IPv4Range,
- @PayloadParam("gatewayIPv4") String gatewayIPv4);
-
- /**
- * Deletes the specified persistent network resource.
- *
- * @param networkName name of the persistent network resource to delete.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Networks:delete")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks/{network}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- Operation delete(@PathParam("network") String networkName);
-
- /**
- * @see NetworkApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Networks:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseNetworks.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Network> listFirstPage();
-
- /**
- * @see NetworkApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Networks:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseNetworks.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Network> listAtMarker(@QueryParam("pageToken") @Nullable String marker);
-
- /**
- * Retrieves the list of persistent network resources contained within the specified project.
- * By default the list as a maximum size of 100, if no options are provided or ListOptions#getMaxResults() has not
- * been set.
- *
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the list
- * @see ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("Networks:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseNetworks.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Network> listAtMarker(@QueryParam("pageToken") @Nullable String marker,
- ListOptions options);
-
- /**
- * @see NetworkApi#list(org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Networks:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseNetworks.class)
- @Transform(ParseNetworks.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Network> list();
-
- /**
- * A paged version of NetworkApi#list()
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see PagedIterable
- * @see NetworkApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Networks:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/networks")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseNetworks.class)
- @Transform(ParseNetworks.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Network> list(ListOptions options);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java
deleted file mode 100644
index 94cfe05..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import java.util.Map;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.domain.Project;
-import org.jclouds.googlecomputeengine.handlers.MetadataBinder;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SkipEncoding;
-
-/**
- * Provides access to Projects via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/projects"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface ProjectApi {
-
- /**
- * Returns the specified project resource.
- *
- * @param projectName name of the project to return
- * @return if successful, this method returns a Project resource
- */
- @Named("Projects:get")
- @GET
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @Path("/projects/{project}")
- Project get(@PathParam("project") String projectName);
-
- /**
- * Sets metadata common to all instances within the specified project using the data included in the request.
- * <p/>
- * NOTE: This *sets* metadata items on the project (vs *adding* items to metadata),
- * if there are pre-existing metadata items that must be kept these must be fetched first and then re-set on the
- * new Metadata, e.g.
- * <pre><tt>
- * Metadata.Builder current = projectApi.get("myProject").getCommonInstanceMetadata().toBuilder();
- * current.addItem("newItem","newItemValue");
- * projectApi.setCommonInstanceMetadata(current.build());
- * </tt></pre>
- *
- * @param projectName name of the project to return
- * @param metadata the metadata to set
- * @param fingerprint The current fingerprint for the metadata
- * @return an Operations resource. To check on the status of an operation, poll the Operations resource returned
- * to you, and look for the status field.
- */
- @Named("Projects:setCommonInstanceMetadata")
- @POST
- @Path("/projects/{project}/setCommonInstanceMetadata")
- @OAuthScopes(COMPUTE_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @MapBinder(MetadataBinder.class)
- Operation setCommonInstanceMetadata(@PathParam("project") String projectName,
- @PayloadParam("items") Map<String, String> metadata,
- @PayloadParam("fingerprint") String fingerprint);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
deleted file mode 100644
index 872918d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Region;
-import org.jclouds.googlecomputeengine.functions.internal.ParseRegions;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Regions via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/regions"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface RegionApi {
-
- /**
- * Returns the specified region resource
- *
- * @param regionName name of the region resource to return.
- * @return If successful, this method returns a Region resource
- */
- @Named("Regions:get")
- @GET
- @Path("/regions/{region}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- Region get(@PathParam("region") String regionName);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Regions:list")
- @GET
- @Path("/regions")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRegions.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Region> listFirstPage();
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Regions:list")
- @GET
- @Path("/regions")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRegions.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Region> listAtMarker(String marker);
-
- /**
- * Retrieves the listFirstPage of region resources available to the specified project.
- * By default the listFirstPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults()
- * has not been set.
- *
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the listFirstPage
- * @see org.jclouds.googlecomputeengine.options.ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("Regions:list")
- @GET
- @Path("/regions")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRegions.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Region> listAtMarker(String marker, ListOptions listOptions);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionApi#list(org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Regions:list")
- @GET
- @Path("/regions")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRegions.class)
- @Transform(ParseRegions.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Region> list();
-
- /**
- * A paged version of RegionApi#listFirstPage()
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see org.jclouds.googlecomputeengine.features.RegionApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- * @see org.jclouds.collect.PagedIterable
- */
- @Named("Regions:list")
- @GET
- @Path("/regions")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRegions.class)
- @Transform(ParseRegions.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Region> list(ListOptions listOptions);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
deleted file mode 100644
index 9f5c48d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.functions.internal.ParseRegionOperations;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Operations via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/operations"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface RegionOperationApi {
-
- /**
- * Retrieves the specified operation resource.
- *
- * @param region the region the operation is in
- * @param operationName name of the operation resource to return.
- * @return If successful, this method returns an Operation resource
- */
- @Named("RegionOperations:get")
- @GET
- @Path("/regions/{region}/operations/{operation}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Operation getInRegion(@PathParam("region") String region, @PathParam("operation") String operationName);
-
- /**
- * Deletes the specified operation resource.
- *
- * @param region the region the operation is in
- * @param operationName name of the operation resource to delete.
- */
- @Named("RegionOperations:delete")
- @DELETE
- @Path("/regions/{region}/operations/{operation}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteInRegion(@PathParam("region") String region, @PathParam("operation") String operationName);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionOperationApi#listAtMarkerInRegion(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("RegionOperations:list")
- @GET
- @Path("/regions/{region}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseRegionOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listFirstPageInRegion(@PathParam("region") String region);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionOperationApi#listAtMarkerInRegion(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("RegionOperations:list")
- @GET
- @Path("/regions/{region}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseRegionOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listAtMarkerInRegion(@PathParam("region") String region,
- @QueryParam("pageToken") @Nullable String marker);
-
- /**
- * Retrieves the listFirstPage of operation resources contained within the specified project.
- * By default the listFirstPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults()
- * has not been set.
- *
- * @param region the region to list in
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the list, starting at marker
- * @see org.jclouds.googlecomputeengine.options.ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("RegionOperations:list")
- @GET
- @Path("/regions/{region}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseRegionOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listAtMarkerInRegion(@PathParam("region") String region,
- @QueryParam("pageToken") @Nullable String marker,
- ListOptions listOptions);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RegionOperationApi#listInRegion(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("RegionOperations:list")
- @GET
- @Path("/regions/{region}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseRegionOperations.class)
- @Transform(ParseRegionOperations.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Operation> listInRegion(@PathParam("region") String region);
-
- /**
- * A paged version of RegionOperationApi#listFirstPageInRegion(String)
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see org.jclouds.collect.PagedIterable
- * @see org.jclouds.googlecomputeengine.features.RegionOperationApi#listAtMarkerInRegion(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("RegionOperations:list")
- @GET
- @Path("/regions/{region}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseRegionOperations.class)
- @Transform(ParseRegionOperations.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Operation> listInRegion(@PathParam("region") String region, ListOptions listOptions);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
deleted file mode 100644
index 5405181..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import java.net.URI;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.domain.Route;
-import org.jclouds.googlecomputeengine.functions.internal.ParseRoutes;
-import org.jclouds.googlecomputeengine.handlers.RouteBinder;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.googlecomputeengine.options.RouteOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Routes via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/routess"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface RouteApi {
-
- /**
- * Returns the specified route resource
- *
- * @param routeName name of the region resource to return.
- * @return If successful, this method returns a Route resource
- */
- @Named("Routes:get")
- @GET
- @Path("/global/routes/{route}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- Route get(@PathParam("route") String routeName);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RouteApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Routes:list")
- @GET
- @Path("/global/routes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRoutes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Route> listFirstPage();
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RouteApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Routes:list")
- @GET
- @Path("/global/routes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRoutes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Route> listAtMarker(String marker);
-
- /**
- * Retrieves the listFirstPage of route resources available to the specified project.
- * By default the listFirstPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults()
- * has not been set.
- *
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the listFirstPage
- * @see org.jclouds.googlecomputeengine.options.ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("Routes:list")
- @GET
- @Path("/global/routes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRoutes.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Route> listAtMarker(String marker, ListOptions listOptions);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.RouteApi#list(org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Routes:list")
- @GET
- @Path("/global/routes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRoutes.class)
- @Transform(ParseRoutes.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Route> list();
-
- /**
- * A paged version of RegionApi#listFirstPage()
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see org.jclouds.googlecomputeengine.features.RouteApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- * @see org.jclouds.collect.PagedIterable
- */
- @Named("Routes:list")
- @GET
- @Path("/global/routes")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseRoutes.class)
- @Transform(ParseRoutes.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Route> list(ListOptions listOptions);
-
- /**
- * Deletes the specified route resource.
- *
- * @param routeName name of the route resource to delete.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field. If the route did not exist the result is null.
- */
- @Named("Routes:delete")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/routes/{route}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation delete(@PathParam("route") String routeName);
-
- /**
- * Creates a route resource in the specified project using the data included in the request.
- *
- * @param name the name of the route to be inserted.
- * @param network the network to which to add the route
- * @param routeOptions the options of the route to add
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Routes:insert")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/global/routes")
- @OAuthScopes({COMPUTE_SCOPE})
- @MapBinder(RouteBinder.class)
- Operation createInNetwork(@PayloadParam("name") String name,
- @PayloadParam("network") URI network,
- @PayloadParam("options") RouteOptions routeOptions);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
deleted file mode 100644
index 89fe8d5..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.domain.Snapshot;
-import org.jclouds.googlecomputeengine.functions.internal.ParseSnapshots;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Snapshots via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/snapshots"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface SnapshotApi {
-
- /**
- * Returns the specified snapshot resource.
- *
- * @param snapshotName name of the snapshot resource to return.
- * @return a Snapshot resource.
- */
- @Named("Snapshots:get")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots/{snapshot}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Snapshot get(@PathParam("snapshot") String snapshotName);
-
- /**
- * Deletes the specified snapshot resource.
- *
- * @param snapshotName name of the snapshot resource to delete.
- * @return an Operation resource. To check on the status of an operation, poll the Operations resource returned to
- * you, and look for the status field.
- */
- @Named("Snapshots:delete")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots/{snapshot}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Operation delete(@PathParam("snapshot") String snapshotName);
-
- /**
- * @see org.jclouds.googlecomputeengine.features.SnapshotApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Snapshots:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseSnapshots.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Snapshot> listFirstPage();
-
- /**
- * @see org.jclouds.googlecomputeengine.features.SnapshotApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Snapshots:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseSnapshots.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Snapshot> listAtMarker(@QueryParam("pageToken") @Nullable String marker);
-
- /**
- * Retrieves the listPage of persistent disk resources contained within the specified project and zone.
- * By default the listPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults() has
- * not been set.
- *
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the listPage
- * @see org.jclouds.googlecomputeengine.options.ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("Snapshots:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseSnapshots.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Snapshot> listAtMarker(@QueryParam("pageToken") @Nullable String marker, ListOptions listOptions);
-
- /**
- * A paged version of SnapshotApi#listPage(String)
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see org.jclouds.collect.PagedIterable
- * @see org.jclouds.googlecomputeengine.features.SnapshotApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Snapshots:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseSnapshots.class)
- @Transform(ParseSnapshots.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Snapshot> list();
-
- @Named("Snapshots:list")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/global/snapshots")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseSnapshots.class)
- @Transform(ParseSnapshots.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Snapshot> list(ListOptions options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java
deleted file mode 100644
index 246c66d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Zone;
-import org.jclouds.googlecomputeengine.functions.internal.ParseZones;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Zones via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/zones"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface ZoneApi {
-
- /**
- * Returns the specified zone resource
- *
- * @param zoneName name of the zone resource to return.
- * @return If successful, this method returns a Zone resource
- */
- @Named("Zones:get")
- @GET
- @Path("/zones/{zone}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- Zone get(@PathParam("zone") String zoneName);
-
- /**
- * @see ZoneApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Zones:list")
- @GET
- @Path("/zones")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseZones.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Zone> listFirstPage();
-
- /**
- * @see ZoneApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Zones:list")
- @GET
- @Path("/zones")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseZones.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Zone> listAtMarker(String marker);
-
- /**
- * Retrieves the listFirstPage of zone resources available to the specified project.
- * By default the listFirstPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults()
- * has not been set.
- *
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the listFirstPage
- * @see ListOptions
- * @see ListPage
- */
- @Named("Zones:list")
- @GET
- @Path("/zones")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseZones.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Zone> listAtMarker(String marker, ListOptions listOptions);
-
- /**
- * @see ZoneApi#list(org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("Zones:list")
- @GET
- @Path("/zones")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseZones.class)
- @Transform(ParseZones.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Zone> list();
-
- /**
- * A paged version of ZoneApi#listFirstPage()
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see ZoneApi#listAtMarker(String, org.jclouds.googlecomputeengine.options.ListOptions)
- * @see PagedIterable
- */
- @Named("Zones:list")
- @GET
- @Path("/zones")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @ResponseParser(ParseZones.class)
- @Transform(ParseZones.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Zone> list(ListOptions listOptions);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java
deleted file mode 100644
index 37cd2c9..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.features;
-
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404;
-import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.collect.PagedIterable;
-import org.jclouds.googlecomputeengine.domain.ListPage;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.functions.internal.ParseZoneOperations;
-import org.jclouds.googlecomputeengine.options.ListOptions;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.filters.OAuthAuthenticator;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SkipEncoding;
-import org.jclouds.rest.annotations.Transform;
-
-/**
- * Provides access to Operations via their REST API.
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1/operations"/>
- */
-@SkipEncoding({'/', '='})
-@RequestFilters(OAuthAuthenticator.class)
-public interface ZoneOperationApi {
-
- /**
- * Retrieves the specified operation resource.
- *
- * @param zone the zone the operation is in
- * @param operationName name of the operation resource to return.
- * @return If successful, this method returns an Operation resource
- */
- @Named("ZoneOperations:get")
- @GET
- @Path("/zones/{zone}/operations/{operation}")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Operation getInZone(@PathParam("zone") String zone, @PathParam("operation") String operationName);
-
- /**
- * Deletes the specified operation resource.
- *
- * @param zone the zone the operation is in
- * @param operationName name of the operation resource to delete.
- */
- @Named("ZoneOperations:delete")
- @DELETE
- @Path("/zones/{zone}/operations/{operation}")
- @OAuthScopes(COMPUTE_SCOPE)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteInZone(@PathParam("zone") String zone, @PathParam("operation") String operationName);
-
- /**
- * @see ZoneOperationApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("ZoneOperations:list")
- @GET
- @Path("/zones/{zone}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseZoneOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listFirstPageInZone(@PathParam("zone") String zone);
-
- /**
- * @see ZoneOperationApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("ZoneOperations:list")
- @GET
- @Path("/zones/{zone}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseZoneOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listAtMarkerInZone(@PathParam("zone") String zone,
- @QueryParam("pageToken") @Nullable String marker);
-
- /**
- * Retrieves the listFirstPage of operation resources contained within the specified project.
- * By default the listFirstPage as a maximum size of 100, if no options are provided or ListOptions#getMaxResults()
- * has not been set.
- *
- * @param zone the zone to list in
- * @param marker marks the beginning of the next list page
- * @param listOptions listing options
- * @return a page of the list, starting at marker
- * @see ListOptions
- * @see org.jclouds.googlecomputeengine.domain.ListPage
- */
- @Named("ZoneOperations:list")
- @GET
- @Path("/zones/{zone}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseZoneOperations.class)
- @Fallback(EmptyIterableWithMarkerOnNotFoundOr404.class)
- ListPage<Operation> listAtMarkerInZone(@PathParam("zone") String zone,
- @QueryParam("pageToken") @Nullable String marker,
- ListOptions listOptions);
-
- /**
- * @see ZoneOperationApi#listInZone(String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("ZoneOperations:list")
- @GET
- @Path("/zones/{zone}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseZoneOperations.class)
- @Transform(ParseZoneOperations.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Operation> listInZone(@PathParam("zone") String zone);
-
- /**
- * A paged version of ZoneOperationApi#listFirstPageInZone(String)
- *
- * @return a Paged, Fluent Iterable that is able to fetch additional pages when required
- * @see PagedIterable
- * @see ZoneOperationApi#listAtMarkerInZone(String, String, org.jclouds.googlecomputeengine.options.ListOptions)
- */
- @Named("ZoneOperations:list")
- @GET
- @Path("/zones/{zone}/operations")
- @OAuthScopes(COMPUTE_READONLY_SCOPE)
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseZoneOperations.class)
- @Transform(ParseZoneOperations.ToPagedIterable.class)
- @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
- PagedIterable<Operation> listInZone(@PathParam("zone") String zone, ListOptions listOptions);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java b/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java
deleted file mode 100644
index c6bc1ac..0000000
--- a/dependencies/jclouds/apis/gce/1.8.0-stratos/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.googlecomputeengine.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_INTERVAL;
-import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_TIMEOUT;
-import static org.jclouds.util.Predicates2.retry;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
-import org.jclouds.googlecomputeengine.config.UserProject;
-import org.jclouds.googlecomputeengine.domain.Network;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.domain.internal.NetworkAndAddressRange;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.util.concurrent.Atomics;
-
-@Singleton
-public class CreateNetworkIfNeeded implements Function<NetworkAndAddressRange, Network> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- protected final GoogleComputeEngineApi api;
- protected final Supplier<String> userProject;
- private final Predicate<AtomicReference<Operation>> operationDonePredicate;
- private final long operationCompleteCheckInterval;
- private final long operationCompleteCheckTimeout;
-
- @Inject
- public CreateNetworkIfNeeded(GoogleComputeEngineApi api,
- @UserProject Supplier<String> userProject,
- @Named("global") Predicate<AtomicReference<Operation>> operationDonePredicate,
- @Named(OPERATION_COMPLETE_INTERVAL) Long operationCompleteCheckInterval,
- @Named(OPERATION_COMPLETE_TIMEOUT) Long operationCompleteCheckTimeout) {
- this.api = checkNotNull(api, "api");
- this.userProject = checkNotNull(userProject, "userProject");
- this.operationCompleteCheckInterval = checkNotNull(operationCompleteCheckInterval,
- "operation completed check interval");
- this.operationCompleteCheckTimeout = checkNotNull(operationCompleteCheckTimeout,
- "operation completed check timeout");
- this.operationDonePredicate = checkNotNull(operationDonePredicate, "operationDonePredicate");
- }
-
- @Override
- public Network apply(NetworkAndAddressRange input) {
- checkNotNull(input, "input");
-
- Network nw = api.getNetworkApiForProject(userProject.get()).get(input.getName());
- if (nw != null) {
- return nw;
- }
-
- if (input.getGateway().isPresent()) {
- AtomicReference<Operation> operation = Atomics.newReference(api.getNetworkApiForProject(userProject
- .get()).createInIPv4RangeWithGateway(input.getName(), input.getIpV4Range(), input.getGateway().get()));
- retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval,
- MILLISECONDS).apply(operation);
-
- checkState(!operation.get().getHttpError().isPresent(), "Could not create network, operation failed" + operation);
- } else {
- AtomicReference<Operation> operation = Atomics.newReference(api.getNetworkApiForProject(userProject
- .get()).createInIPv4Range(input.getName(), input.getIpV4Range()));
- retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval,
- MILLISECONDS).apply(operation);
-
- checkState(!operation.get().getHttpError().isPresent(), "Could not create network, operation failed" + operation);
- }
- return checkNotNull(api.getNetworkApiForProject(userProject.get()).get(input.getName()),
- "no network with name %s was found", input.getName());
- }
-}