Sync docs from master to gh-pages

This commit is contained in:
buildmaster
2020-01-17 23:21:51 +00:00
parent 08c7fd8761
commit dc7cd382ef
2 changed files with 6 additions and 110 deletions
+3 -55
View File
@@ -256,7 +256,7 @@ $(addBlockSwitches);
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><strong>2.2.2.BUILD-SNAPSHOT</strong></p>
<p><strong>3.0.0.BUILD-SNAPSHOT</strong></p>
</div>
<div class="paragraph">
<p>This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
@@ -1614,22 +1614,7 @@ Otherwise, it is shared by all the <code>@RibbonClients</code>. If you use <code
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">@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();
}
}</code></pre>
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">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]</code></pre>
</div>
</div>
<div class="paragraph">
@@ -1643,44 +1628,7 @@ protected static class FooConfiguration {
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">@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&lt;Server&gt; ribbonServerList(IClientConfig config) {
return new RibbonClientDefaultConfigurationTestsConfig.BazServiceList(config);
}
@Bean
public ServerListSubsetFilter serverListFilter() {
ServerListSubsetFilter filter = new ServerListSubsetFilter();
return filter;
}
}</code></pre>
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">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]</code></pre>
</div>
</div>
</div>
+3 -55
View File
@@ -256,7 +256,7 @@ $(addBlockSwitches);
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><strong>2.2.2.BUILD-SNAPSHOT</strong></p>
<p><strong>3.0.0.BUILD-SNAPSHOT</strong></p>
</div>
<div class="paragraph">
<p>This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
@@ -1614,22 +1614,7 @@ Otherwise, it is shared by all the <code>@RibbonClients</code>. If you use <code
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">@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();
}
}</code></pre>
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">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]</code></pre>
</div>
</div>
<div class="paragraph">
@@ -1643,44 +1628,7 @@ protected static class FooConfiguration {
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">@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&lt;Server&gt; ribbonServerList(IClientConfig config) {
return new RibbonClientDefaultConfigurationTestsConfig.BazServiceList(config);
}
@Bean
public ServerListSubsetFilter serverListFilter() {
ServerListSubsetFilter filter = new ServerListSubsetFilter();
return filter;
}
}</code></pre>
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">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]</code></pre>
</div>
</div>
</div>