From dc7cd382efbfcf6e2bdfec3316702d059c5f6dff Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 17 Jan 2020 23:21:51 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/index.html | 58 ++---------------------- reference/html/spring-cloud-netflix.html | 58 ++---------------------- 2 files changed, 6 insertions(+), 110 deletions(-) diff --git a/reference/html/index.html b/reference/html/index.html index c7b20905e..0decf4a6a 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -256,7 +256,7 @@ $(addBlockSwitches);
-

2.2.2.BUILD-SNAPSHOT

+

3.0.0.BUILD-SNAPSHOT

This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration @@ -1614,22 +1614,7 @@ Otherwise, it is shared by all the @RibbonClients. If you use

-
@Configuration(proxyBeanMethods = false)
-protected static class FooConfiguration {
-
-    @Bean
-    public ZonePreferenceServerListFilter serverListFilter() {
-        ZonePreferenceServerListFilter filter = new ZonePreferenceServerListFilter();
-        filter.setZone("myTestZone");
-        return filter;
-    }
-
-    @Bean
-    public IPing ribbonPing() {
-        return new PingUrl();
-    }
-
-}
+
Unresolved directive in index.adoc - include::/opt/jenkins/data/workspace/spring-cloud-netflix-master-ci/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java[tags=sample_override_ribbon_config,indent=0]
@@ -1643,44 +1628,7 @@ protected static class FooConfiguration {
-
@RibbonClients(defaultConfiguration = DefaultRibbonConfig.class)
-public class RibbonClientDefaultConfigurationTestsConfig {
-
-    public static class BazServiceList extends ConfigurationBasedServerList {
-
-        public BazServiceList(IClientConfig config) {
-            super.initWithNiwsConfig(config);
-        }
-
-    }
-
-}
-
-@Configuration(proxyBeanMethods = false)
-class DefaultRibbonConfig {
-
-    @Bean
-    public IRule ribbonRule() {
-        return new BestAvailableRule();
-    }
-
-    @Bean
-    public IPing ribbonPing() {
-        return new PingUrl();
-    }
-
-    @Bean
-    public ServerList<Server> ribbonServerList(IClientConfig config) {
-        return new RibbonClientDefaultConfigurationTestsConfig.BazServiceList(config);
-    }
-
-    @Bean
-    public ServerListSubsetFilter serverListFilter() {
-        ServerListSubsetFilter filter = new ServerListSubsetFilter();
-        return filter;
-    }
-
-}
+
Unresolved directive in index.adoc - include::/opt/jenkins/data/workspace/spring-cloud-netflix-master-ci/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java[tags=sample_default_ribbon_config,indent=0]
diff --git a/reference/html/spring-cloud-netflix.html b/reference/html/spring-cloud-netflix.html index c7b20905e..d6a9dda6a 100644 --- a/reference/html/spring-cloud-netflix.html +++ b/reference/html/spring-cloud-netflix.html @@ -256,7 +256,7 @@ $(addBlockSwitches);
-

2.2.2.BUILD-SNAPSHOT

+

3.0.0.BUILD-SNAPSHOT

This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration @@ -1614,22 +1614,7 @@ Otherwise, it is shared by all the @RibbonClients. If you use

-
@Configuration(proxyBeanMethods = false)
-protected static class FooConfiguration {
-
-    @Bean
-    public ZonePreferenceServerListFilter serverListFilter() {
-        ZonePreferenceServerListFilter filter = new ZonePreferenceServerListFilter();
-        filter.setZone("myTestZone");
-        return filter;
-    }
-
-    @Bean
-    public IPing ribbonPing() {
-        return new PingUrl();
-    }
-
-}
+
Unresolved directive in spring-cloud-netflix.adoc - include::/opt/jenkins/data/workspace/spring-cloud-netflix-master-ci/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java[tags=sample_override_ribbon_config,indent=0]
@@ -1643,44 +1628,7 @@ protected static class FooConfiguration {
-
@RibbonClients(defaultConfiguration = DefaultRibbonConfig.class)
-public class RibbonClientDefaultConfigurationTestsConfig {
-
-    public static class BazServiceList extends ConfigurationBasedServerList {
-
-        public BazServiceList(IClientConfig config) {
-            super.initWithNiwsConfig(config);
-        }
-
-    }
-
-}
-
-@Configuration(proxyBeanMethods = false)
-class DefaultRibbonConfig {
-
-    @Bean
-    public IRule ribbonRule() {
-        return new BestAvailableRule();
-    }
-
-    @Bean
-    public IPing ribbonPing() {
-        return new PingUrl();
-    }
-
-    @Bean
-    public ServerList<Server> ribbonServerList(IClientConfig config) {
-        return new RibbonClientDefaultConfigurationTestsConfig.BazServiceList(config);
-    }
-
-    @Bean
-    public ServerListSubsetFilter serverListFilter() {
-        ServerListSubsetFilter filter = new ServerListSubsetFilter();
-        return filter;
-    }
-
-}
+
Unresolved directive in spring-cloud-netflix.adoc - include::/opt/jenkins/data/workspace/spring-cloud-netflix-master-ci/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java[tags=sample_default_ribbon_config,indent=0]