Use AutoService to generate service loader metadata
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0bc9fcfe Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0bc9fcfe Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0bc9fcfe Branch: refs/heads/master Commit: 0bc9fcfe06897d8ff619aba0da9653312c92ab77 Parents: e605633 Author: Jeremy Daggett <[email protected]> Authored: Mon Nov 17 13:33:08 2014 -0800 Committer: Jeremy Daggett <[email protected]> Committed: Mon Dec 1 09:13:03 2014 -0800 ---------------------------------------------------------------------- apis/openstack-neutron/pom.xml | 5 +++++ .../openstack/neutron/v2/NeutronApiMetadata.java | 2 ++ .../neutron/v2_0/NeutronApiMetadata.java | 2 ++ .../services/org.jclouds.apis.ApiMetadata | 19 ------------------- 4 files changed, 9 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0bc9fcfe/apis/openstack-neutron/pom.xml ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/pom.xml b/apis/openstack-neutron/pom.xml index 0c16f8d..52e2b24 100644 --- a/apis/openstack-neutron/pom.xml +++ b/apis/openstack-neutron/pom.xml @@ -101,6 +101,11 @@ <artifactId>mockwebserver</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/jclouds/blob/0bc9fcfe/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java index 043bed8..fec4e6a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java @@ -31,6 +31,7 @@ import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -38,6 +39,7 @@ import com.google.inject.Module; * Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API * */ +@AutoService(ApiMetadata.class) public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/0bc9fcfe/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java index 6327f1e..8d5e51c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java @@ -32,6 +32,7 @@ import org.jclouds.openstack.neutron.v2_0.config.NeutronHttpApiModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -39,6 +40,7 @@ import com.google.inject.Module; * Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API */ @Deprecated +@AutoService(ApiMetadata.class) public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/0bc9fcfe/apis/openstack-neutron/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-neutron/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 2365644..0000000 --- a/apis/openstack-neutron/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,19 +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. -# - -org.jclouds.openstack.neutron.v2_0.NeutronApiMetadata -org.jclouds.openstack.neutron.v2.NeutronApiMetadata
