diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index 57ee14e615..0201601a36 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -38,8 +38,8 @@ FIXME_IDENTITY FIXME_CREDENTIAL - * org.jclouds.atmos*;version="${project.version}";-noimport:=true + * @@ -73,7 +73,13 @@ ${project.version} test + + com.google.auto.service + auto-service + true + + live diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java index ab7757a963..4b4d2a6ea4 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java @@ -23,14 +23,17 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.atmos.blobstore.config.AtmosBlobStoreContextModule; import org.jclouds.atmos.config.AtmosHttpApiModule; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +@AutoService(ApiMetadata.class) public class AtmosApiMetadata extends BaseHttpApiMetadata { private static Builder builder() { diff --git a/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 3cc11413c4..0000000000 --- a/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.atmos.AtmosApiMetadata \ No newline at end of file diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml index 02100a954f..6a46eb1ac2 100644 --- a/apis/byon/pom.xml +++ b/apis/byon/pom.xml @@ -35,13 +35,9 @@ file://c:/test.txt org.jclouds.byon*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* + org.apache.jclouds @@ -79,6 +75,11 @@ snakeyaml 1.11 + + com.google.auto.service + auto-service + true + diff --git a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java index 8f188e365f..efe9330833 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java +++ b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java @@ -19,11 +19,13 @@ package org.jclouds.byon; import java.net.URI; import org.jclouds.JcloudsVersion; +import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.byon.config.BYONComputeServiceContextModule; import org.jclouds.byon.config.YamlNodeStoreModule; import org.jclouds.compute.ComputeServiceContext; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -35,6 +37,7 @@ import com.google.inject.Module; * This class is not setup to allow a subclasses to override the type of api, * asyncapi, or context. This is an optimization for s. */ +@AutoService(ApiMetadata.class) public class BYONApiMetadata extends BaseApiMetadata { @Override diff --git a/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 28169081a1..0000000000 --- a/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.byon.BYONApiMetadata \ No newline at end of file diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml index 865d30a4d2..178128f2a3 100644 --- a/apis/chef/pom.xml +++ b/apis/chef/pom.xml @@ -37,15 +37,11 @@ chef-webui ${user.home}/.chef/webui.pem - - org.jclouds;version=${project.version}, - org.jclouds*;version=${project.version}, - * - org.jclouds.chef*;version=${project.version};-noimport:=true, org.jclouds.ohai*;version=${project.version};-noimport:=true, + org.jclouds*;version="${project.version}",* @@ -98,6 +94,11 @@ 1.0.9 test + + com.google.auto.service + auto-service + true + diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java index ede03e94f0..d983a98c4d 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java +++ b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java @@ -28,18 +28,21 @@ import static org.jclouds.chef.config.ChefProperties.CHEF_USE_OMNIBUS; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.chef.config.ChefBootstrapModule; import org.jclouds.chef.config.ChefHttpApiModule; import org.jclouds.chef.config.ChefParserModule; import org.jclouds.ohai.config.JMXOhaiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for OpsCode's Chef api. */ +@AutoService(ApiMetadata.class) public class ChefApiMetadata extends BaseHttpApiMetadata { /** diff --git a/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index c7a6f4e18a..0000000000 --- a/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.chef.ChefApiMetadata \ No newline at end of file diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml index 0b698ebea9..97c04b6aba 100644 --- a/apis/cloudfiles/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -91,6 +91,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java index 1c81946e09..7d4de8126e 100644 --- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java @@ -19,6 +19,7 @@ package org.jclouds.cloudfiles; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule; import org.jclouds.cloudfiles.config.CloudFilesHttpApiModule; @@ -27,10 +28,12 @@ import org.jclouds.openstack.swift.SwiftApiMetadata; import org.jclouds.openstack.swift.blobstore.SwiftBlobSigner; import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; import com.google.inject.TypeLiteral; +@AutoService(ApiMetadata.class) public class CloudFilesApiMetadata extends SwiftApiMetadata { @Override diff --git a/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 4ae761171e..0000000000 --- a/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudfiles.CloudFilesApiMetadata \ No newline at end of file diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index 4b9d332697..9b984b03db 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -57,13 +57,9 @@ osFamily=CENTOS org.jclouds.cloudstack*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* + org.apache.jclouds @@ -106,7 +102,13 @@ logback-classic test + + com.google.auto.service + auto-service + true + + live diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java index 56dc772a04..840e869143 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java @@ -21,16 +21,19 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.cloudstack.compute.config.CloudStackComputeServiceContextModule; -import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.config.CloudStackHttpApiModule; +import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for Citrix/Apache CloudStack api. */ +@AutoService(ApiMetadata.class) public class CloudStackApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index ad45dcefd0..0000000000 --- a/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudstack.CloudStackApiMetadata \ No newline at end of file diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index fed4f1d7fc..22911139e7 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -67,6 +67,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java index c1cfe43810..fc63417160 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java @@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.cloudwatch.config.CloudWatchHttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for Amazon's CloudWatch api. */ +@AutoService(ApiMetadata.class) public class CloudWatchApiMetadata extends BaseHttpApiMetadata { diff --git a/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index de872be08a..0000000000 --- a/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudwatch.CloudWatchApiMetadata \ No newline at end of file diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index 4fe34935a2..4ca432113d 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -44,12 +44,7 @@ hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65 org.jclouds.ec2*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -103,7 +98,13 @@ + + com.google.auto.service + auto-service + true + + @@ -112,6 +113,7 @@ + live diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java index 2b081c5115..fc227cac54 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java @@ -34,9 +34,11 @@ import org.jclouds.ec2.compute.config.EC2ResolveImagesModule; import org.jclouds.ec2.config.EC2HttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +@AutoService(ApiMetadata.class) public final class EC2ApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index dce15a1be9..0000000000 --- a/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.ec2.EC2ApiMetadata \ No newline at end of file diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index eb30babbe7..47dde1fac4 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -39,13 +39,9 @@ FIXME_CREDENTIAL imageId=38df0986-4d85-4b76-b502-3878ffc80161,loginUser=toor org.jclouds.elasticstack*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* + org.apache.jclouds @@ -90,7 +86,13 @@ + + com.google.auto.service + auto-service + true + + live diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java index 88495f038b..d336a93e30 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java @@ -22,17 +22,20 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.elasticstack.compute.config.ElasticStackComputeServiceContextModule; import org.jclouds.elasticstack.config.ElasticStackHttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for the ElasticStack API */ +@AutoService(ApiMetadata.class) public class ElasticStackApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 562d32947b..0000000000 --- a/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elasticstack.ElasticStackApiMetadata \ No newline at end of file diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml index 2849d2c1b6..2926e5bf5a 100644 --- a/apis/filesystem/pom.xml +++ b/apis/filesystem/pom.xml @@ -66,6 +66,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java index 4b71d0a3c4..d4a3b647a2 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java @@ -18,13 +18,17 @@ package org.jclouds.filesystem; import java.net.URI; +import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.filesystem.config.FilesystemBlobStoreContextModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for jclouds Filesystem-based BlobStore */ +@AutoService(ApiMetadata.class) public class FilesystemApiMetadata extends BaseApiMetadata { @Override diff --git a/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 9219cb2ff6..0000000000 --- a/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.filesystem.FilesystemApiMetadata \ No newline at end of file diff --git a/apis/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml index 019bd1d759..4c6392db3a 100644 --- a/apis/openstack-cinder/pom.xml +++ b/apis/openstack-cinder/pom.xml @@ -42,11 +42,7 @@ passwordCredentials org.jclouds.openstack.cinder.v1*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -85,6 +81,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java index e532f376b1..fc9ac76a47 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java @@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.cinder.v1.config.CinderHttpApiModule; import org.jclouds.openstack.cinder.v1.config.CinderParserModule; import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; @@ -31,12 +32,14 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.R 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; /** - * Implementation of {@link org.jclouds.apis.ApiMetadata} for Cinder v1 API + * Implementation of {@link ApiMetadata} for Cinder v1 API */ +@AutoService(ApiMetadata.class) public class CinderApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 083e7f77c7..0000000000 --- a/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,18 +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.cinder.v1.CinderApiMetadata diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml index 431687114f..27881d7c1a 100644 --- a/apis/openstack-keystone/pom.xml +++ b/apis/openstack-keystone/pom.xml @@ -42,11 +42,7 @@ passwordCredentials org.jclouds.openstack*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -78,8 +74,13 @@ mockwebserver test + + com.google.auto.service + auto-service + true + - + live diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java index 0c76a587cf..a06ea13be9 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java @@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; @@ -31,12 +32,14 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneParserModule; 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; /** - * Implementation of {@link org.jclouds.apis.ApiMetadata} for Keystone 2.0 API + * Implementation of {@link ApiMetadata} for Keystone 2.0 API */ +@AutoService(ApiMetadata.class) public class KeystoneApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 72609ba3b7..0000000000 --- a/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.openstack.keystone.v2_0.KeystoneApiMetadata diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml index 57c16155c8..d3c43c5ffb 100644 --- a/apis/openstack-nova-ec2/pom.xml +++ b/apis/openstack-nova-ec2/pom.xml @@ -40,12 +40,7 @@ org.jclouds.openstack.nova.ec2*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -92,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java index 1180fcf398..e173acffaf 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java @@ -26,6 +26,7 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.ec2.EC2ApiMetadata; import org.jclouds.ec2.compute.EC2ComputeServiceContext; import org.jclouds.ec2.compute.config.EC2ResolveImagesModule; @@ -34,9 +35,11 @@ import org.jclouds.openstack.nova.ec2.config.NovaEC2ComputeServiceContextModule; import org.jclouds.openstack.nova.ec2.config.NovaEC2HttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +@AutoService(ApiMetadata.class) public final class NovaEC2ApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index f77b7570af..0000000000 --- a/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.openstack.nova.ec2.NovaEC2ApiMetadata \ No newline at end of file diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml index 1a3de0e14a..cc08146c12 100644 --- a/apis/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -44,12 +44,7 @@ passwordCredentials org.jclouds.openstack.nova.v2_0*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -113,6 +108,11 @@ + + com.google.auto.service + auto-service + true + diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java index be37fe7ca8..d73a1daa9b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java @@ -27,6 +27,7 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; @@ -38,12 +39,14 @@ import org.jclouds.openstack.nova.v2_0.config.NovaParserModule; 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; /** - * Implementation of {@link org.jclouds.apis.ApiMetadata} for Nova 2.0 API + * Implementation of {@link ApiMetadata} for Nova 2.0 API */ +@AutoService(ApiMetadata.class) public class NovaApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 67c3d34032..0000000000 --- a/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.openstack.nova.v2_0.NovaApiMetadata \ No newline at end of file diff --git a/apis/openstack-swift/pom.xml b/apis/openstack-swift/pom.xml index 23333c193f..6e50671e45 100644 --- a/apis/openstack-swift/pom.xml +++ b/apis/openstack-swift/pom.xml @@ -101,6 +101,11 @@ mockwebserver test + + com.google.auto.service + auto-service + true + diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java index 478bd81a10..3e0efd2a3f 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java @@ -23,6 +23,7 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext; @@ -34,9 +35,11 @@ import org.jclouds.openstack.swift.v1.config.SwiftTypeAdapters; 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; +@AutoService(ApiMetadata.class) public class SwiftApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index c5b801728d..0000000000 --- a/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,18 +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.swift.v1.SwiftApiMetadata diff --git a/apis/openstack-trove/pom.xml b/apis/openstack-trove/pom.xml index 17f8406cac..20848ca6d6 100644 --- a/apis/openstack-trove/pom.xml +++ b/apis/openstack-trove/pom.xml @@ -40,13 +40,9 @@ passwordCredentials org.jclouds.openstack.trove.v1_0*;version="${project.version}" - - org.jclouds.rest.internal;version="${jclouds.version}", - org.jclouds.labs*;version="${project.version}", - org.jclouds*;version="${jclouds.version}", - * - + org.jclouds*;version="${project.version}",* + org.apache.jclouds.api @@ -83,6 +79,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java index c40d9412a1..3d5e469395 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java @@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; @@ -31,12 +32,14 @@ import org.jclouds.openstack.trove.v1.config.TroveParserModule; 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; /** - * Implementation of {@link org.jclouds.apis.ApiMetadata} for the OpenStack Trove v1 API. + * Implementation of {@link ApiMetadata} for the OpenStack Trove v1 API. */ +@AutoService(ApiMetadata.class) public class TroveApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 558658ca91..0000000000 --- a/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,18 +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.trove.v1.TroveApiMetadata diff --git a/apis/rackspace-clouddns/pom.xml b/apis/rackspace-clouddns/pom.xml index 161cf6f2a8..dae75d2ce2 100644 --- a/apis/rackspace-clouddns/pom.xml +++ b/apis/rackspace-clouddns/pom.xml @@ -39,11 +39,7 @@ ${test.rackspace-us.credential} org.jclouds.rackspace.clouddns.v1*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -113,6 +109,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java index 158f3c60a0..55ea21d44b 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java @@ -24,18 +24,21 @@ import static org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCrede import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ProviderModule; import org.jclouds.rackspace.clouddns.v1.config.CloudDNSHttpApiModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for Rackspace Cloud DNS 1.0 API */ +@AutoService(ApiMetadata.class) public class CloudDNSApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index eae6b81b84..0000000000 --- a/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata \ No newline at end of file diff --git a/apis/rackspace-cloudidentity/pom.xml b/apis/rackspace-cloudidentity/pom.xml index 24600c48b3..8eb7198dca 100644 --- a/apis/rackspace-cloudidentity/pom.xml +++ b/apis/rackspace-cloudidentity/pom.xml @@ -42,11 +42,7 @@ RAX-KSKEY:apiKeyCredentials org.jclouds.rackspace.cloudidentity.v2_0*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -80,6 +76,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java index d505cb896e..3636a6c17b 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java @@ -30,12 +30,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for the Rackspace Cloud Identity Service */ +@AutoService(ApiMetadata.class) public class CloudIdentityApiMetadata extends KeystoneApiMetadata { @Override diff --git a/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 37e56b6239..0000000000 --- a/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata diff --git a/apis/rackspace-cloudloadbalancers/pom.xml b/apis/rackspace-cloudloadbalancers/pom.xml index c117e80c9b..89bc663548 100644 --- a/apis/rackspace-cloudloadbalancers/pom.xml +++ b/apis/rackspace-cloudloadbalancers/pom.xml @@ -96,7 +96,13 @@ logback-classic test + + com.google.auto.service + auto-service + true + + live diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java index 16cc2e787f..67e07957bc 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java @@ -15,6 +15,7 @@ * limitations under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1; + import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import static org.jclouds.reflect.Reflection2.typeToken; @@ -22,6 +23,7 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.loadbalancer.LoadBalancerServiceContext; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType; @@ -32,11 +34,14 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.config.CloudLoadBalancersHttp import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; + /** - * Implementation of {@link org.jclouds.apis.ApiMetadata} for the Rackspace Cloud Load Balancers v1.0 API. + * Implementation of {@link ApiMetadata} for the Rackspace Cloud Load Balancers v1.0 API. */ +@AutoService(ApiMetadata.class) public class CloudLoadBalancersApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 4364b84d36..0000000000 --- a/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata \ No newline at end of file diff --git a/apis/route53/pom.xml b/apis/route53/pom.xml index 89a889ba53..1caeee21e4 100644 --- a/apis/route53/pom.xml +++ b/apis/route53/pom.xml @@ -67,6 +67,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java b/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java index a43bdb7a9c..385189b6d7 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java +++ b/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java @@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.rest.internal.BaseHttpApiMetadata; import org.jclouds.route53.config.Route53HttpApiModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for Amazon's Route53 api. */ +@AutoService(ApiMetadata.class) public class Route53ApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index d9372d577e..0000000000 --- a/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.route53.Route53ApiMetadata diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 14ea07674b..ad124b65b1 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -96,6 +96,11 @@ mockwebserver test + + com.google.auto.service + auto-service + true + diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java index a35928f46c..d124fd8bad 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java @@ -35,6 +35,7 @@ import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; import org.jclouds.s3.config.S3HttpApiModule; import org.jclouds.s3.reference.S3Headers; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -52,6 +53,7 @@ import com.google.inject.Module; * not present in the base api. For example, you could make a subtype for * context, that exposes admin operations. */ +@AutoService(ApiMetadata.class) public class S3ApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index e206c63617..0000000000 --- a/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.s3.S3ApiMetadata \ No newline at end of file diff --git a/apis/sqs/pom.xml b/apis/sqs/pom.xml index 2a19b1e2e4..acdf8d3729 100644 --- a/apis/sqs/pom.xml +++ b/apis/sqs/pom.xml @@ -61,6 +61,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java index c57fee120d..9db46bc709 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java @@ -24,15 +24,18 @@ import static org.jclouds.sqs.config.SQSProperties.CREATE_QUEUE_RETRY_INTERVAL; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.rest.internal.BaseHttpApiMetadata; import org.jclouds.sqs.config.SQSHttpApiModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** * Implementation of {@link ApiMetadata} for Amazon's Simple Queue Service api. */ +@AutoService(ApiMetadata.class) public class SQSApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 8831fe1bab..0000000000 --- a/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.sqs.SQSApiMetadata \ No newline at end of file diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml index ec6819e3dc..bd44b115f9 100644 --- a/apis/sts/pom.xml +++ b/apis/sts/pom.xml @@ -67,6 +67,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java index 18e0ec8a1a..43ef877a0d 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java +++ b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java @@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.rest.internal.BaseHttpApiMetadata; import org.jclouds.sts.config.STSHttpApiModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for Amazon's STS api. */ +@AutoService(ApiMetadata.class) public class STSApiMetadata extends BaseHttpApiMetadata { @Override diff --git a/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index df7b5d89f7..0000000000 --- a/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.sts.STSApiMetadata diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml index b05f0b2b55..edf408f8e0 100644 --- a/apis/swift/pom.xml +++ b/apis/swift/pom.xml @@ -113,6 +113,11 @@ mockwebserver test + + com.google.auto.service + auto-service + true + diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java index ddafc79b80..bf059be96e 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java @@ -24,6 +24,7 @@ import static org.jclouds.reflect.Reflection2.typeToken; import java.net.URI; import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule.SwiftTemporaryUrlExtensionModule; @@ -31,9 +32,11 @@ import org.jclouds.openstack.swift.config.SwiftHttpApiModule; import org.jclouds.openstack.swift.config.SwiftHttpApiModule.StorageEndpointModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +@AutoService(ApiMetadata.class) public class SwiftApiMetadata extends BaseHttpApiMetadata { @Override @@ -89,7 +92,7 @@ public class SwiftApiMetadata extends BaseHttpApiMetadata { return new SwiftApiMetadata(this); } } - + private static class ConcreteBuilder extends Builder { @Override protected ConcreteBuilder self() { diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java index 35049df182..9c1a204669 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java @@ -23,18 +23,21 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV import java.util.Properties; +import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; import org.jclouds.openstack.services.ServiceType; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule.SwiftKeystoneTemporaryUrlExtensionModule; -import org.jclouds.openstack.swift.config.SwiftKeystoneHttpApiModule; import org.jclouds.openstack.swift.config.SwiftHttpApiModule.KeystoneStorageEndpointModule; +import org.jclouds.openstack.swift.config.SwiftKeystoneHttpApiModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +@AutoService(ApiMetadata.class) public class SwiftKeystoneApiMetadata extends SwiftApiMetadata { @Override @@ -89,7 +92,7 @@ public class SwiftKeystoneApiMetadata extends SwiftApiMetadata { return new SwiftKeystoneApiMetadata(this); } } - + private static class ConcreteBuilder extends Builder { @Override protected ConcreteBuilder self() { diff --git a/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 2abea61d86..0000000000 --- a/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,2 +0,0 @@ -org.jclouds.openstack.swift.SwiftApiMetadata -org.jclouds.openstack.swift.SwiftKeystoneApiMetadata \ No newline at end of file diff --git a/blobstore/pom.xml b/blobstore/pom.xml index 4789125217..f1175ecefc 100644 --- a/blobstore/pom.xml +++ b/blobstore/pom.xml @@ -58,7 +58,13 @@ test-jar test + + com.google.auto.service + auto-service + true + + diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java index 88e13bba14..deaa4a5c23 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java @@ -18,12 +18,16 @@ package org.jclouds.blobstore; import java.net.URI; +import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.blobstore.config.TransientBlobStoreContextModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for jclouds in-memory (Transient) API */ +@AutoService(ApiMetadata.class) public class TransientApiMetadata extends BaseApiMetadata { public static Builder builder() { diff --git a/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index a5bb992fe4..0000000000 --- a/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.blobstore.TransientApiMetadata \ No newline at end of file diff --git a/compute/pom.xml b/compute/pom.xml index 02bcfa6c75..cb7a11dd57 100644 --- a/compute/pom.xml +++ b/compute/pom.xml @@ -64,6 +64,11 @@ test-jar test + + com.google.auto.service + auto-service + true + diff --git a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java index 0d6a2a6f44..020bac771e 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java @@ -18,13 +18,17 @@ package org.jclouds.compute.stub; import java.net.URI; +import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.stub.config.StubComputeServiceContextModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for jclouds in-memory (Stub) API */ +@AutoService(ApiMetadata.class) public class StubApiMetadata extends BaseApiMetadata { @Override diff --git a/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 542beaa856..0000000000 --- a/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.compute.stub.StubApiMetadata \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index eb0c915c09..1366fd6bca 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -113,6 +113,11 @@ auto-value test + + com.google.auto.service + auto-service + true + diff --git a/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java b/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java index 5a57473370..9854efd95c 100644 --- a/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java +++ b/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java @@ -20,11 +20,15 @@ import org.jclouds.logging.Logger; import org.jclouds.logging.config.LoggingModule; import org.jclouds.logging.jdk.JDKLogger; +import com.google.auto.service.AutoService; + /** * Configures logging of type {@link JDKLogger} */ +@AutoService(LoggingModule.class) public class JDKLoggingModule extends LoggingModule { - public Logger.LoggerFactory createLoggerFactory() { - return new JDKLogger.JDKLoggerFactory(); - } + @Override + public Logger.LoggerFactory createLoggerFactory() { + return new JDKLogger.JDKLoggerFactory(); + } } diff --git a/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule deleted file mode 100644 index 1bf9839d4c..0000000000 --- a/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.logging.jdk.config.JDKLoggingModule diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java index 6cb7127442..485ebe04d7 100644 --- a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java +++ b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java @@ -21,9 +21,12 @@ import java.net.URI; import org.jclouds.http.IntegrationTestClient; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of @ link org.jclouds.types.ApiMetadata} for testing. + * Implementation of {@link ApiMetadata} for testing. */ +@AutoService(ApiMetadata.class) public class JcloudsTestBlobStoreApiMetadata extends BaseHttpApiMetadata { public static Builder builder() { diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java index 66f080c974..1ebb0c7d7c 100644 --- a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java +++ b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java @@ -21,9 +21,12 @@ import java.net.URI; import org.jclouds.http.IntegrationTestClient; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of @ link org.jclouds.types.ApiMetadata} for testing. + * Implementation of {@link ApiMetadata} for testing. */ +@AutoService(ApiMetadata.class) public class JcloudsTestComputeApiMetadata extends BaseHttpApiMetadata { public static Builder builder() { diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java index 12988d27bf..a0a7f601f1 100644 --- a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java +++ b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java @@ -21,9 +21,12 @@ import java.net.URI; import org.jclouds.http.IntegrationTestClient; import org.jclouds.rest.internal.BaseHttpApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of @ link org.jclouds.types.ApiMetadata} for testing. + * Implementation of {@link ApiMetadata} for testing. */ +@AutoService(ApiMetadata.class) public class JcloudsTestYetAnotherComputeApiMetadata extends BaseHttpApiMetadata { public static Builder builder() { diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java index 8bca329bf0..897dc2f3e6 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java @@ -21,17 +21,19 @@ import java.net.URI; import org.jclouds.apis.JcloudsTestBlobStoreApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; /** - * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. + * Implementation of {@link ProviderMetadata} for testing. */ +@AutoService(ProviderMetadata.class) public class JcloudsTestBlobStoreProviderMetadata extends BaseProviderMetadata { public static Builder builder() { return new Builder(); } - + @Override public Builder toBuilder() { return Builder.class.cast(builder().fromProviderMetadata(this)); diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java index 790ebff51f..d57a3de31f 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java @@ -21,11 +21,13 @@ import java.net.URI; import org.jclouds.apis.JcloudsTestComputeApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; /** - * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. + * Implementation of {@link ProviderMetadata} for testing. */ +@AutoService(ProviderMetadata.class) public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata { public static Builder builder() { @@ -36,7 +38,7 @@ public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return Builder.class.cast(builder().fromProviderMetadata(this)); } - + public JcloudsTestComputeProviderMetadata() { super(builder()); } diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java index aaa51dc508..cfa7b03ba9 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java @@ -21,13 +21,15 @@ import java.net.URI; import org.jclouds.apis.JcloudsTestComputeApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; /** - * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. + * Implementation of {@link ProviderMetadata} for testing. */ +@AutoService(ProviderMetadata.class) public class JcloudsTestYetAnotherComputeProviderMetadata extends BaseProviderMetadata { - + public static Builder builder() { return new Builder(); } @@ -36,7 +38,7 @@ public class JcloudsTestYetAnotherComputeProviderMetadata extends BaseProviderMe public Builder toBuilder() { return Builder.class.cast(builder().fromProviderMetadata(this)); } - + public JcloudsTestYetAnotherComputeProviderMetadata() { super(builder()); } diff --git a/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 5a98023e24..0000000000 --- a/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1,3 +0,0 @@ -org.jclouds.apis.JcloudsTestBlobStoreApiMetadata -org.jclouds.apis.JcloudsTestComputeApiMetadata -org.jclouds.apis.JcloudsTestYetAnotherComputeApiMetadata diff --git a/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 6e9898bedd..0000000000 --- a/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1,3 +0,0 @@ -org.jclouds.providers.JcloudsTestBlobStoreProviderMetadata -org.jclouds.providers.JcloudsTestComputeProviderMetadata -org.jclouds.providers.JcloudsTestYetAnotherComputeProviderMetadata diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml index fe47403ee7..550f385aa2 100644 --- a/drivers/log4j/pom.xml +++ b/drivers/log4j/pom.xml @@ -65,7 +65,11 @@ log4j compile + + com.google.auto.service + auto-service + true + - diff --git a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java index 4dd69fe6c4..a4061813bb 100644 --- a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java +++ b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java @@ -20,9 +20,12 @@ import org.jclouds.logging.Logger.LoggerFactory; import org.jclouds.logging.config.LoggingModule; import org.jclouds.logging.log4j.Log4JLogger; +import com.google.auto.service.AutoService; + /** * Configures logging of type {@link Log4JLogger} */ +@AutoService(LoggingModule.class) public class Log4JLoggingModule extends LoggingModule { @Override diff --git a/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule deleted file mode 100644 index e6d96efb4c..0000000000 --- a/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.logging.log4j.config.Log4JLoggingModule diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml index 56d16f07ea..1f329a4f2c 100644 --- a/drivers/slf4j/pom.xml +++ b/drivers/slf4j/pom.xml @@ -70,6 +70,11 @@ 1.7.2 compile + + com.google.auto.service + auto-service + true + diff --git a/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java b/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java index e53349690f..dd43071e8f 100644 --- a/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java +++ b/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java @@ -20,9 +20,12 @@ import org.jclouds.logging.Logger.LoggerFactory; import org.jclouds.logging.config.LoggingModule; import org.jclouds.logging.slf4j.SLF4JLogger; +import com.google.auto.service.AutoService; + /** * Configures logging of type {@link SLF4JLogger} */ +@AutoService(LoggingModule.class) public class SLF4JLoggingModule extends LoggingModule { @Override diff --git a/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule deleted file mode 100644 index 1cbe65edc8..0000000000 --- a/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.logging.slf4j.config.SLF4JLoggingModule diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index a92b2785e7..70afae66cd 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -71,6 +71,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java index 797ee512c5..32b3d0a72e 100644 --- a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java +++ b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java @@ -26,11 +26,14 @@ import org.jclouds.cloudwatch.CloudWatchApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's CloudWatch * provider. * */ +@AutoService(ProviderMetadata.class) public class AWSCloudWatchProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 553504a806..0000000000 --- a/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.cloudwatch.AWSCloudWatchProviderMetadata diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index c15b1909b2..6addf1b10d 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -113,6 +113,11 @@ + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java index da1f65c7d0..d03ada724d 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java @@ -15,6 +15,7 @@ * limitations under the License. */ package org.jclouds.aws.ec2; + import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_AMI_QUERY; import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY; import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_REGIONS; @@ -28,10 +29,13 @@ import org.jclouds.aws.domain.Region; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for Amazon's * Elastic Compute Cloud (EC2) provider. */ +@AutoService(ProviderMetadata.class) public class AWSEC2ProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 636b065928..0000000000 --- a/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.ec2.AWSEC2ProviderMetadata diff --git a/providers/aws-route53/pom.xml b/providers/aws-route53/pom.xml index 2bb289d87c..9d6b29377b 100644 --- a/providers/aws-route53/pom.xml +++ b/providers/aws-route53/pom.xml @@ -71,6 +71,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java b/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java index f187728fc3..1eb812a078 100644 --- a/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java +++ b/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java @@ -23,11 +23,14 @@ import org.jclouds.route53.Route53ApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Route53 * provider. * */ +@AutoService(ProviderMetadata.class) public class AWSRoute53ProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 40927710fc..0000000000 --- a/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.route53.AWSRoute53ProviderMetadata diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index c226c51853..40581a512c 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -122,6 +122,11 @@ + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java index 81480d3e95..899c3decb1 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java @@ -35,10 +35,13 @@ import org.jclouds.aws.domain.Region; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of {@link org.jclouds.providers.ProviderMetadata} for Amazon's Simple Storage Service * (S3) provider. */ +@AutoService(ProviderMetadata.class) public class AWSS3ProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index be3179d7be..0000000000 --- a/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.s3.AWSS3ProviderMetadata diff --git a/providers/aws-sqs/pom.xml b/providers/aws-sqs/pom.xml index 598444b267..ea0420f27d 100644 --- a/providers/aws-sqs/pom.xml +++ b/providers/aws-sqs/pom.xml @@ -76,6 +76,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java index f47e16f272..9039d90c69 100644 --- a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java +++ b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java @@ -34,10 +34,13 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.sqs.SQSApiMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Simple Queue Service * provider. */ +@AutoService(ProviderMetadata.class) public class AWSSQSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 6f797d6ddc..0000000000 --- a/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.sqs.AWSSQSProviderMetadata diff --git a/providers/aws-sts/pom.xml b/providers/aws-sts/pom.xml index 71365ec3f6..870bdc5d2d 100644 --- a/providers/aws-sts/pom.xml +++ b/providers/aws-sts/pom.xml @@ -71,6 +71,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java index 5bca71df3f..26a0666570 100644 --- a/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java +++ b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java @@ -23,11 +23,14 @@ import org.jclouds.sts.STSApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's STS * provider. * */ +@AutoService(ProviderMetadata.class) public class AWSSTSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 3c3406f91e..0000000000 --- a/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.aws.sts.AWSSTSProviderMetadata diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index 52f155cbfe..fa39b10427 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -69,6 +69,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java index 3d0a94d8f4..348fc947ba 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java @@ -22,9 +22,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Microsoft Azure Blob Service. */ +@AutoService(ProviderMetadata.class) public class AzureBlobProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index f5f5631a61..0000000000 --- a/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.azureblob.AzureBlobProviderMetadata diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index 2828fa4983..f8999f4354 100644 --- a/providers/cloudfiles-uk/pom.xml +++ b/providers/cloudfiles-uk/pom.xml @@ -89,6 +89,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java index 096d3a5442..4ceb23c0b7 100644 --- a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java +++ b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.cloudfiles.CloudFilesApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Files UK. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files UK. */ +@AutoService(ProviderMetadata.class) public class CloudFilesUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 2843a8883e..0000000000 --- a/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudfiles.CloudFilesUKProviderMetadata diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index 46b216d3c7..41341ef6a9 100644 --- a/providers/cloudfiles-us/pom.xml +++ b/providers/cloudfiles-us/pom.xml @@ -90,6 +90,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java index fda686b02c..a8df81688b 100644 --- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java +++ b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.cloudfiles.CloudFilesApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Files US. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files US. */ +@AutoService(ProviderMetadata.class) public class CloudFilesUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 9dca819360..0000000000 --- a/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudfiles.CloudFilesUSProviderMetadata diff --git a/providers/dynect/pom.xml b/providers/dynect/pom.xml index 199b73f88d..1099f1e619 100644 --- a/providers/dynect/pom.xml +++ b/providers/dynect/pom.xml @@ -75,6 +75,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java index e42a34953f..ac1a86b667 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java @@ -25,9 +25,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for DynECT Managed DNS. + * Implementation of {@link ProviderMetadata} for DynECT Managed DNS. */ +@AutoService(ProviderMetadata.class) public class DynECTProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 10bc2961f3..0000000000 --- a/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.dynect.v3.DynECTProviderMetadata diff --git a/providers/elastichosts-ams-e/pom.xml b/providers/elastichosts-ams-e/pom.xml index 2cc261dec0..408dd99b4f 100644 --- a/providers/elastichosts-ams-e/pom.xml +++ b/providers/elastichosts-ams-e/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java b/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java index 54cb2b37ff..7577d8dd6a 100644 --- a/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java +++ b/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Amsterdam. + * Implementation of {@link ProviderMetadata} for ElasticHosts Amsterdam. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsAmsterdamMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 508e627af6..0000000000 --- a/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsAmsterdamMetadata diff --git a/providers/elastichosts-hkg-e/pom.xml b/providers/elastichosts-hkg-e/pom.xml index 58f0c8c70d..fa74385d8d 100644 --- a/providers/elastichosts-hkg-e/pom.xml +++ b/providers/elastichosts-hkg-e/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java b/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java index e4a4709f0a..05e3ceb1e3 100644 --- a/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java +++ b/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Hong Kong. + * Implementation of {@link ProviderMetadata} for ElasticHosts Hong Kong. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsHongKongProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 067e3bb043..0000000000 --- a/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsHongKongProviderMetadata diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 29333a70f1..e0c44e82eb 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java index de516138e3..6e3abc6ce3 100644 --- a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java +++ b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java @@ -25,10 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; -/** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts LA Peer1. +import com.google.auto.service.AutoService; +/** + * Implementation of {@link ProviderMetadata} for ElasticHosts LA Peer1. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsPeer1LosAngelesProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index f659bfab9a..0000000000 --- a/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsPeer1LosAngelesProviderMetadata diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 0640522ec9..6f5268330a 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java index 47b80ba08d..9de3a3f6ba 100644 --- a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java +++ b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London BlueSquare. + * Implementation of {@link ProviderMetadata} for ElasticHosts London BlueSquare. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsBlueSquareLondonProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index b7305b8ff6..0000000000 --- a/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsBlueSquareLondonProviderMetadata diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index 1783b7938c..db275a3bb7 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java index 4d428b1485..799548b900 100644 --- a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java +++ b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London Peer 1. + * Implementation of {@link ProviderMetadata} for ElasticHosts London Peer 1. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsPeer1LondonProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 5f8edefd6f..0000000000 --- a/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsPeer1LondonProviderMetadata diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index 70f2c7af74..2a250027a3 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java index dfa920c49d..1603c1cfc1 100644 --- a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java +++ b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts San Antonio Peer 1. + * Implementation of {@link ProviderMetadata} for ElasticHosts San Antonio Peer 1. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsPeer1SanAntonioProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 7981420bd9..0000000000 --- a/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsPeer1SanAntonioProviderMetadata diff --git a/providers/elastichosts-sjc-c/pom.xml b/providers/elastichosts-sjc-c/pom.xml index 2a033df291..72f297273a 100644 --- a/providers/elastichosts-sjc-c/pom.xml +++ b/providers/elastichosts-sjc-c/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java b/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java index 4db8428f41..e4dc5f525d 100644 --- a/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java +++ b/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts San Jose. + * Implementation of {@link ProviderMetadata} for ElasticHosts San Jose. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsSanJoseProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index e739bdd17b..0000000000 --- a/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsSanJoseProviderMetadata diff --git a/providers/elastichosts-syd-v/pom.xml b/providers/elastichosts-syd-v/pom.xml index 822eea38e6..5ebf960605 100644 --- a/providers/elastichosts-syd-v/pom.xml +++ b/providers/elastichosts-syd-v/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java b/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java index d05ba00457..1c383fe612 100644 --- a/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java +++ b/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Sydney. + * Implementation of {@link ProviderMetadata} for ElasticHosts Sydney. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsSydneyProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 256bcdc4e5..0000000000 --- a/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsSydneyProviderMetadata diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index 45959c0e90..6484592f35 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java index 9f473cd768..8056ff318b 100644 --- a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java +++ b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java @@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Toronto Peer 1. + * Implementation of {@link ProviderMetadata} for ElasticHosts Toronto Peer 1. */ +@AutoService(ProviderMetadata.class) public class ElasticHostsPeer1TorontoProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 4b12b32564..0000000000 --- a/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.elastichosts.ElasticHostsPeer1TorontoProviderMetadata diff --git a/providers/enterprisechef/pom.xml b/providers/enterprisechef/pom.xml index d256601e25..08f1c3946b 100644 --- a/providers/enterprisechef/pom.xml +++ b/providers/enterprisechef/pom.xml @@ -72,6 +72,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java index d72cc780b5..cf77accf21 100644 --- a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java +++ b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java @@ -22,10 +22,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of @ link org.jclouds.types.ProviderMetadata} for Enterprise - * Chef + * Implementation of @ link ProviderMetadata} for Enterprise Chef */ +@AutoService(ProviderMetadata.class) public class EnterpriseChefProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 7861cbbd3f..0000000000 --- a/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.enterprisechef.EnterpriseChefProviderMetadata diff --git a/providers/glesys/pom.xml b/providers/glesys/pom.xml index 0faf1e671c..cb5efa5f8e 100644 --- a/providers/glesys/pom.xml +++ b/providers/glesys/pom.xml @@ -74,7 +74,13 @@ ${project.version} test + + com.google.auto.service + auto-service + true + + live diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java index 56083e149d..66015e174f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java @@ -27,9 +27,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for GleSYS. + * Implementation of {@link ProviderMetadata} for GleSYS. */ +@AutoService(ProviderMetadata.class) public class GleSYSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 9d2743670b..0000000000 --- a/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.glesys.GleSYSProviderMetadata \ No newline at end of file diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index a3a664805a..218505b097 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java index a85ce04472..80df18259e 100644 --- a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java +++ b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java @@ -23,10 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Go2Cloud's Johannesburg1 - * provider. + * Implementation of {@link ProviderMetadata} for Go2Cloud's Johannesburg1 provider. */ +@AutoService(ProviderMetadata.class) public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index d6a143212a..0000000000 --- a/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.go2cloud.Go2CloudJohannesburg1ProviderMetadata diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index 0f926dc68a..faebc3c97c 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -84,6 +84,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java index 6f095a73c0..ef2b0aa8fb 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java @@ -27,9 +27,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for GoGrid. + * Implementation of {@link ProviderMetadata} for GoGrid. */ +@AutoService(ProviderMetadata.class) public class GoGridProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 4aef048a04..0000000000 --- a/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.gogrid.GoGridProviderMetadata diff --git a/providers/hpcloud-blockstorage/pom.xml b/providers/hpcloud-blockstorage/pom.xml index 49959f257e..00f56dfcc3 100644 --- a/providers/hpcloud-blockstorage/pom.xml +++ b/providers/hpcloud-blockstorage/pom.xml @@ -95,6 +95,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java b/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java index 5889d683f3..2a00440b54 100644 --- a/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java +++ b/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java @@ -29,10 +29,13 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.REQU import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud Block Storage service. + * Implementation of {@link ProviderMetadata} for HP Cloud Block Storage service. * */ +@AutoService(ProviderMetadata.class) public class HPCloudBlockStorageProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 4312483f2b..0000000000 --- a/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.hpcloud.blockstorage.HPCloudBlockStorageProviderMetadata diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml index 175e839abf..bdbb8c5c75 100644 --- a/providers/hpcloud-compute/pom.xml +++ b/providers/hpcloud-compute/pom.xml @@ -100,6 +100,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java index 7fde453abf..320fb7e006 100644 --- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java +++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java @@ -37,12 +37,14 @@ import org.jclouds.openstack.nova.v2_0.config.NovaParserModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud Compute Services. + * Implementation of {@link ProviderMetadata} for HP Cloud Compute Services. */ +@AutoService(ProviderMetadata.class) public class HPCloudComputeProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index c25bb188ee..0000000000 --- a/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.hpcloud.compute.HPCloudComputeProviderMetadata diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml index 58a35b7ed7..200743e328 100644 --- a/providers/hpcloud-objectstorage/pom.xml +++ b/providers/hpcloud-objectstorage/pom.xml @@ -100,6 +100,11 @@ log4j test + + com.google.auto.service + auto-service + true + diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java index 415214e644..6e7abbb299 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java @@ -26,9 +26,12 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud + * Implementation of {@link ProviderMetadata} for HP Cloud */ +@AutoService(ProviderMetadata.class) public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index f937926f6b..0000000000 --- a/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.hpcloud.objectstorage.HPCloudObjectStorageProviderMetadata diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index 171d50b6de..fa1e5aea1c 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java index de9493b677..ff64317817 100644 --- a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java +++ b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java @@ -23,9 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for OpenHosting East1. + * Implementation of {@link ProviderMetadata} for OpenHosting East1. */ +@AutoService(ProviderMetadata.class) public class OpenHostingEast1ProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 996483c31e..0000000000 --- a/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.openhosting.OpenHostingEast1ProviderMetadata diff --git a/providers/rackspace-cloudblockstorage-uk/pom.xml b/providers/rackspace-cloudblockstorage-uk/pom.xml index 87841c91f4..c369e8396b 100644 --- a/providers/rackspace-cloudblockstorage-uk/pom.xml +++ b/providers/rackspace-cloudblockstorage-uk/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-uk.credential} org.jclouds.rackspace.cloudblockstorage.uk*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -107,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java index 01b8c6a9a4..51b532f29c 100644 --- a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java @@ -34,12 +34,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Block Storage. + * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Block Storage. */ +@AutoService(ProviderMetadata.class) public class CloudBlockStorageUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 97fe43d278..0000000000 --- a/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudblockstorage.uk.CloudBlockStorageUKProviderMetadata diff --git a/providers/rackspace-cloudblockstorage-us/pom.xml b/providers/rackspace-cloudblockstorage-us/pom.xml index 9a734123b7..1b68a35bda 100644 --- a/providers/rackspace-cloudblockstorage-us/pom.xml +++ b/providers/rackspace-cloudblockstorage-us/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-us.credential} org.jclouds.rackspace.cloudblockstorage.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -107,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java index 5741b151ca..19675fa7e0 100644 --- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java @@ -34,12 +34,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Block Storage. + * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Block Storage. */ +@AutoService(ProviderMetadata.class) public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 84a96e253c..0000000000 --- a/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudblockstorage.us.CloudBlockStorageUSProviderMetadata diff --git a/providers/rackspace-clouddatabases-uk/pom.xml b/providers/rackspace-clouddatabases-uk/pom.xml index 887ae2b1e1..3050ee621a 100644 --- a/providers/rackspace-clouddatabases-uk/pom.xml +++ b/providers/rackspace-clouddatabases-uk/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-uk.credential} org.jclouds.rackspace.clouddatabases.uk*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -107,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java index fa146d6b8a..307e86f610 100644 --- a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java +++ b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java @@ -36,12 +36,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Databases. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud Databases. */ +@AutoService(ProviderMetadata.class) public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index a6a3c9a986..0000000000 --- a/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.clouddatabases.uk.CloudDatabasesUKProviderMetadata diff --git a/providers/rackspace-clouddatabases-us/pom.xml b/providers/rackspace-clouddatabases-us/pom.xml index 1e1298bf9d..f302bec2f7 100644 --- a/providers/rackspace-clouddatabases-us/pom.xml +++ b/providers/rackspace-clouddatabases-us/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-us.credential} org.jclouds.rackspace.clouddatabases.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -107,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java index f72e4fa180..4d595a70e6 100644 --- a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java +++ b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java @@ -36,12 +36,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Databases. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud Databases. */ +@AutoService(ProviderMetadata.class) public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 607e501c3a..0000000000 --- a/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.clouddatabases.us.CloudDatabasesUSProviderMetadata diff --git a/providers/rackspace-clouddns-uk/pom.xml b/providers/rackspace-clouddns-uk/pom.xml index 57f8129296..94754fea7a 100644 --- a/providers/rackspace-clouddns-uk/pom.xml +++ b/providers/rackspace-clouddns-uk/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-uk.credential} org.jclouds.rackspace.clouddns.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -107,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java b/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java index ee0616a92d..7036f647c6 100644 --- a/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java +++ b/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java @@ -23,9 +23,12 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace DNS UK. + * Implementation of {@link ProviderMetadata} for Rackspace DNS UK. */ +@AutoService(ProviderMetadata.class) public class CloudDNSUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index dbb2966301..0000000000 --- a/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.clouddns.uk.CloudDNSUKProviderMetadata diff --git a/providers/rackspace-clouddns-us/pom.xml b/providers/rackspace-clouddns-us/pom.xml index 84db25e095..f0d5773b40 100644 --- a/providers/rackspace-clouddns-us/pom.xml +++ b/providers/rackspace-clouddns-us/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-us.credential} org.jclouds.rackspace.clouddns.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -126,6 +121,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java b/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java index c35b8dea39..941e983962 100644 --- a/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java +++ b/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java @@ -23,9 +23,12 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace DNS US. + * Implementation of {@link ProviderMetadata} for Rackspace DNS US. */ +@AutoService(ProviderMetadata.class) public class CloudDNSUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index b2db3e2a92..0000000000 --- a/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.clouddns.us.CloudDNSUSProviderMetadata diff --git a/providers/rackspace-cloudloadbalancers-uk/pom.xml b/providers/rackspace-cloudloadbalancers-uk/pom.xml index 73c1135601..dd6188034f 100644 --- a/providers/rackspace-cloudloadbalancers-uk/pom.xml +++ b/providers/rackspace-cloudloadbalancers-uk/pom.xml @@ -102,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java index ffd41119a8..9776ab712c 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java @@ -27,9 +27,12 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud LoadBalancers UK. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud LoadBalancers UK. */ +@AutoService(ProviderMetadata.class) public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 49592e1b95..0000000000 --- a/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata diff --git a/providers/rackspace-cloudloadbalancers-us/pom.xml b/providers/rackspace-cloudloadbalancers-us/pom.xml index 467f242c6a..bb227c6f0a 100644 --- a/providers/rackspace-cloudloadbalancers-us/pom.xml +++ b/providers/rackspace-cloudloadbalancers-us/pom.xml @@ -102,6 +102,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java index 3aeb55cb64..262b8b2cb2 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java @@ -27,9 +27,12 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud LoadBalancers US. + * Implementation of {@link ProviderMetadata} for Rackspace Cloud LoadBalancers US. */ +@AutoService(ProviderMetadata.class) public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index ae58e28099..0000000000 --- a/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata diff --git a/providers/rackspace-cloudservers-uk/pom.xml b/providers/rackspace-cloudservers-uk/pom.xml index 05801336ec..c65a5be8b7 100644 --- a/providers/rackspace-cloudservers-uk/pom.xml +++ b/providers/rackspace-cloudservers-uk/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-uk.credential} org.jclouds.rackspace.cloudservers.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -110,6 +105,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java index 80c94ea84f..8f3519020c 100644 --- a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java +++ b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java @@ -35,12 +35,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; import org.jclouds.rackspace.cloudservers.uk.config.CloudServersUKComputeServiceContextModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Servers. + * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Servers. */ +@AutoService(ProviderMetadata.class) public class CloudServersUKProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 8c85e8b143..0000000000 --- a/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudservers.uk.CloudServersUKProviderMetadata diff --git a/providers/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml index 14d4cec871..a8ce0a2a35 100644 --- a/providers/rackspace-cloudservers-us/pom.xml +++ b/providers/rackspace-cloudservers-us/pom.xml @@ -39,12 +39,7 @@ ${test.rackspace-us.credential} org.jclouds.rackspace.cloudservers.us*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - + org.jclouds*;version="${project.version}",* @@ -110,6 +105,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index 9502934565..dc17faee81 100644 --- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java +++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -35,12 +35,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; import org.jclouds.rackspace.cloudservers.us.config.CloudServersUSComputeServiceContextModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Servers. + * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Servers. */ +@AutoService(ProviderMetadata.class) public class CloudServersUSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index b941fc255b..0000000000 --- a/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index ea2f074504..b700a24e76 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -86,6 +86,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java index 6a66d9e8c1..8bda256286 100644 --- a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java +++ b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java @@ -24,12 +24,14 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.serverlove.config.ServerloveImagesModule; +import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Serverlove Manchester. + * Implementation of {@link ProviderMetadata} for Serverlove Manchester. */ +@AutoService(ProviderMetadata.class) public class ServerloveManchesterProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index f50adb3764..0000000000 --- a/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.serverlove.ServerloveManchesterProviderMetadata diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index de0e90df25..90d1e980a1 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -87,6 +87,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java index 86231ea8c7..72bdc907b0 100644 --- a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java +++ b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java @@ -23,9 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for SkaliCloud Malaysia. + * Implementation of {@link ProviderMetadata} for SkaliCloud Malaysia. */ +@AutoService(ProviderMetadata.class) public class SkaliCloudMalaysiaProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index bb9797a8fe..0000000000 --- a/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.skalicloud.SkaliCloudMalaysiaProviderMetadata diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index 1dc985d908..de1286df1f 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -97,7 +97,13 @@ logback-classic test + + com.google.auto.service + auto-service + true + + live diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java index 6e6014120a..2fbfe44a04 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java @@ -16,20 +16,23 @@ */ package org.jclouds.softlayer; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; - -import java.net.URI; -import java.util.Properties; - import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_INCLUDE_PUBLIC_IMAGES; import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_VIRTUALGUEST_ACTIVE_TRANSACTIONS_DELAY; import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_VIRTUALGUEST_LOGIN_DETAILS_DELAY; +import java.net.URI; +import java.util.Properties; + +import org.jclouds.providers.ProviderMetadata; +import org.jclouds.providers.internal.BaseProviderMetadata; + +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.providers.ProviderMetadata} for SoftLayer. + * Implementation of {@link ProviderMetadata} for SoftLayer. */ +@AutoService(ProviderMetadata.class) public class SoftLayerProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index b79ad351af..0000000000 --- a/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.softlayer.SoftLayerProviderMetadata \ No newline at end of file diff --git a/providers/ultradns-ws/pom.xml b/providers/ultradns-ws/pom.xml index 015d3f2ba2..725ccf867d 100644 --- a/providers/ultradns-ws/pom.xml +++ b/providers/ultradns-ws/pom.xml @@ -67,6 +67,11 @@ logback-classic test + + com.google.auto.service + auto-service + true + diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java index bf7dcf33e8..26d962cd93 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java @@ -22,10 +22,12 @@ import java.util.Properties; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import com.google.auto.service.AutoService; + /** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Neustar - * UltraDNS. + * Implementation of {@link ProviderMetadata} for Neustar UltraDNS. */ +@AutoService(ProviderMetadata.class) public class UltraDNSWSProviderMetadata extends BaseProviderMetadata { public static Builder builder() { diff --git a/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 316f59897f..0000000000 --- a/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.ultradns.ws.UltraDNSWSProviderMetadata diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index 2b01bbd0d9..23becce603 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -79,6 +79,11 @@ ${project.version} test + + com.google.auto.service + auto-service + true + diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java index 1e2e54bca9..635d317307 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java @@ -18,13 +18,17 @@ package org.jclouds.servermanager; import java.net.URI; +import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.servermanager.compute.config.ServerManagerComputeServiceContextModule; +import com.google.auto.service.AutoService; + /** * Implementation of {@link ApiMetadata} for an example of library integration (ServerManager) */ +@AutoService(ApiMetadata.class) public class ServerManagerApiMetadata extends BaseApiMetadata { @Override diff --git a/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index cbad9e4179..0000000000 --- a/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.servermanager.ServerManagerApiMetadata \ No newline at end of file