Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
58e62ebd
Commit
58e62ebd
authored
May 22, 2017
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bumping versions to 1.3.2.BUILD-SNAPSHOT after release
parent
0de72d2d
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
289 additions
and
289 deletions
+289
-289
pom.xml
docs/pom.xml
+1
-1
mvnw.cmd
mvnw.cmd
+143
-143
pom.xml
pom.xml
+1
-1
pom.xml
spring-cloud-netflix-core/pom.xml
+1
-1
RibbonClientPreprocessorOverridesRetryTests.java
...x/ribbon/RibbonClientPreprocessorOverridesRetryTests.java
+120
-120
pom.xml
spring-cloud-netflix-dependencies/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-eureka-client/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-eureka-server/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-hystrix-amqp/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-hystrix-dashboard/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-hystrix-stream/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-sidecar/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-spectator/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-turbine-stream/pom.xml
+1
-1
pom.xml
spring-cloud-netflix-turbine/pom.xml
+1
-1
pom.xml
spring-cloud-starter-archaius/pom.xml
+1
-1
pom.xml
spring-cloud-starter-atlas/pom.xml
+1
-1
pom.xml
spring-cloud-starter-eureka-server/pom.xml
+1
-1
pom.xml
spring-cloud-starter-eureka/pom.xml
+1
-1
pom.xml
spring-cloud-starter-feign/pom.xml
+1
-1
pom.xml
spring-cloud-starter-hystrix-dashboard/pom.xml
+1
-1
pom.xml
spring-cloud-starter-hystrix/pom.xml
+1
-1
pom.xml
spring-cloud-starter-ribbon/pom.xml
+1
-1
pom.xml
spring-cloud-starter-spectator/pom.xml
+1
-1
pom.xml
spring-cloud-starter-turbine-amqp/pom.xml
+1
-1
pom.xml
spring-cloud-starter-turbine-stream/pom.xml
+1
-1
pom.xml
spring-cloud-starter-turbine/pom.xml
+1
-1
pom.xml
spring-cloud-starter-zuul/pom.xml
+1
-1
No files found.
docs/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
</parent>
<artifactId>
spring-cloud-netflix-docs
</artifactId>
<packaging>
pom
</packaging>
...
...
mvnw.cmd
View file @
58e62ebd
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Maven2 Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
set MAVEN_CMD_LINE_ARGS=%*
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Maven2 Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
set MAVEN_CMD_LINE_ARGS=%*
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
exit /B %ERROR_CODE%
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
exit /B %ERROR_CODE%
pom.xml
View file @
58e62ebd
...
...
@@ -3,7 +3,7 @@
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<name>
Spring Cloud Netflix
</name>
<description>
Spring Cloud Netflix
</description>
...
...
spring-cloud-netflix-core/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-core
</artifactId>
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java
View file @
58e62ebd
/*
* Copyright 2013-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
ribbon
;
import
java.net.ConnectException
;
import
java.net.SocketException
;
import
java.net.SocketTimeoutException
;
import
java.net.UnknownHostException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.test.annotation.DirtiesContext
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.util.Assert
;
import
com.netflix.client.DefaultLoadBalancerRetryHandler
;
import
com.netflix.client.RetryHandler
;
import
com.netflix.client.config.IClientConfig
;
/**
* @author Tyler Van Gorder
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
(
classes
=
RibbonClientPreprocessorOverridesRetryTests
.
TestConfiguration
.
class
,
value
=
{
"customRetry.ribbon.MaxAutoRetries=0"
,
"customRetry.ribbon.MaxAutoRetriesNextServer=1"
,
"customRetry.ribbon.OkToRetryOnAllOperations=true"
})
@DirtiesContext
public
class
RibbonClientPreprocessorOverridesRetryTests
{
@Autowired
private
SpringClientFactory
factory
;
@Test
public
void
customRetryIsConfigured
()
throws
Exception
{
RibbonLoadBalancerContext
context
=
(
RibbonLoadBalancerContext
)
this
.
factory
.
getLoadBalancerContext
(
"customRetry"
);
Assert
.
isInstanceOf
(
RetryRibbonConfiguration
.
CustomRetryHandler
.
class
,
context
.
getRetryHandler
());
Assert
.
isTrue
(
context
.
getRetryHandler
().
getMaxRetriesOnSameServer
()
==
0
);
Assert
.
isTrue
(
context
.
getRetryHandler
().
getMaxRetriesOnNextServer
()
==
1
);
Assert
.
isTrue
(
context
.
getRetryHandler
()
.
isCircuitTrippingException
(
new
UnknownHostException
(
"Unknown Host"
)));
}
@Configuration
@RibbonClient
(
name
=
"customRetry"
,
configuration
=
RetryRibbonConfiguration
.
class
)
@Import
({
PropertyPlaceholderAutoConfiguration
.
class
,
ArchaiusAutoConfiguration
.
class
,
RibbonAutoConfiguration
.
class
})
protected
static
class
TestConfiguration
{
}
}
@Configuration
class
RetryRibbonConfiguration
{
@Bean
public
RetryHandler
retryHandler
(
IClientConfig
config
)
{
return
new
CustomRetryHandler
(
config
);
}
class
CustomRetryHandler
extends
DefaultLoadBalancerRetryHandler
{
@SuppressWarnings
(
"unchecked"
)
private
List
<
Class
<?
extends
Throwable
>>
retriable
=
new
ArrayList
()
{
{
add
(
UnknownHostException
.
class
);
add
(
ConnectException
.
class
);
add
(
SocketTimeoutException
.
class
);
}
};
@SuppressWarnings
(
"unchecked"
)
private
List
<
Class
<?
extends
Throwable
>>
circuitRelated
=
new
ArrayList
()
{
{
add
(
UnknownHostException
.
class
);
add
(
SocketException
.
class
);
add
(
SocketTimeoutException
.
class
);
}
};
CustomRetryHandler
(
IClientConfig
config
)
{
super
(
config
);
}
@Override
protected
List
<
Class
<?
extends
Throwable
>>
getRetriableExceptions
()
{
return
retriable
;
}
@Override
protected
List
<
Class
<?
extends
Throwable
>>
getCircuitRelatedExceptions
()
{
return
circuitRelated
;
}
}
}
/*
* Copyright 2013-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
ribbon
;
import
java.net.ConnectException
;
import
java.net.SocketException
;
import
java.net.SocketTimeoutException
;
import
java.net.UnknownHostException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.test.annotation.DirtiesContext
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.util.Assert
;
import
com.netflix.client.DefaultLoadBalancerRetryHandler
;
import
com.netflix.client.RetryHandler
;
import
com.netflix.client.config.IClientConfig
;
/**
* @author Tyler Van Gorder
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
(
classes
=
RibbonClientPreprocessorOverridesRetryTests
.
TestConfiguration
.
class
,
value
=
{
"customRetry.ribbon.MaxAutoRetries=0"
,
"customRetry.ribbon.MaxAutoRetriesNextServer=1"
,
"customRetry.ribbon.OkToRetryOnAllOperations=true"
})
@DirtiesContext
public
class
RibbonClientPreprocessorOverridesRetryTests
{
@Autowired
private
SpringClientFactory
factory
;
@Test
public
void
customRetryIsConfigured
()
throws
Exception
{
RibbonLoadBalancerContext
context
=
(
RibbonLoadBalancerContext
)
this
.
factory
.
getLoadBalancerContext
(
"customRetry"
);
Assert
.
isInstanceOf
(
RetryRibbonConfiguration
.
CustomRetryHandler
.
class
,
context
.
getRetryHandler
());
Assert
.
isTrue
(
context
.
getRetryHandler
().
getMaxRetriesOnSameServer
()
==
0
);
Assert
.
isTrue
(
context
.
getRetryHandler
().
getMaxRetriesOnNextServer
()
==
1
);
Assert
.
isTrue
(
context
.
getRetryHandler
()
.
isCircuitTrippingException
(
new
UnknownHostException
(
"Unknown Host"
)));
}
@Configuration
@RibbonClient
(
name
=
"customRetry"
,
configuration
=
RetryRibbonConfiguration
.
class
)
@Import
({
PropertyPlaceholderAutoConfiguration
.
class
,
ArchaiusAutoConfiguration
.
class
,
RibbonAutoConfiguration
.
class
})
protected
static
class
TestConfiguration
{
}
}
@Configuration
class
RetryRibbonConfiguration
{
@Bean
public
RetryHandler
retryHandler
(
IClientConfig
config
)
{
return
new
CustomRetryHandler
(
config
);
}
class
CustomRetryHandler
extends
DefaultLoadBalancerRetryHandler
{
@SuppressWarnings
(
"unchecked"
)
private
List
<
Class
<?
extends
Throwable
>>
retriable
=
new
ArrayList
()
{
{
add
(
UnknownHostException
.
class
);
add
(
ConnectException
.
class
);
add
(
SocketTimeoutException
.
class
);
}
};
@SuppressWarnings
(
"unchecked"
)
private
List
<
Class
<?
extends
Throwable
>>
circuitRelated
=
new
ArrayList
()
{
{
add
(
UnknownHostException
.
class
);
add
(
SocketException
.
class
);
add
(
SocketTimeoutException
.
class
);
}
};
CustomRetryHandler
(
IClientConfig
config
)
{
super
(
config
);
}
@Override
protected
List
<
Class
<?
extends
Throwable
>>
getRetriableExceptions
()
{
return
retriable
;
}
@Override
protected
List
<
Class
<?
extends
Throwable
>>
getCircuitRelatedExceptions
()
{
return
circuitRelated
;
}
}
}
spring-cloud-netflix-dependencies/pom.xml
View file @
58e62ebd
...
...
@@ -9,7 +9,7 @@
<relativePath/>
</parent>
<artifactId>
spring-cloud-netflix-dependencies
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<name>
spring-cloud-netflix-dependencies
</name>
<description>
Spring Cloud Netflix Dependencies
</description>
...
...
spring-cloud-netflix-eureka-client/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-eureka-client
</artifactId>
...
...
spring-cloud-netflix-eureka-server/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-eureka-server
</artifactId>
...
...
spring-cloud-netflix-hystrix-amqp/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-hystrix-amqp
</artifactId>
...
...
spring-cloud-netflix-hystrix-dashboard/pom.xml
View file @
58e62ebd
...
...
@@ -8,7 +8,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<properties>
...
...
spring-cloud-netflix-hystrix-stream/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-hystrix-stream
</artifactId>
...
...
spring-cloud-netflix-sidecar/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-sidecar
</artifactId>
...
...
spring-cloud-netflix-spectator/pom.xml
View file @
58e62ebd
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-spectator
</artifactId>
...
...
spring-cloud-netflix-turbine-stream/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-turbine-stream
</artifactId>
...
...
spring-cloud-netflix-turbine/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-netflix-turbine
</artifactId>
...
...
spring-cloud-starter-archaius/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-archaius
</artifactId>
...
...
spring-cloud-starter-atlas/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-atlas
</artifactId>
...
...
spring-cloud-starter-eureka-server/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-eureka-server
</artifactId>
...
...
spring-cloud-starter-eureka/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-eureka
</artifactId>
...
...
spring-cloud-starter-feign/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-feign
</artifactId>
...
...
spring-cloud-starter-hystrix-dashboard/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-hystrix-dashboard
</artifactId>
...
...
spring-cloud-starter-hystrix/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-hystrix
</artifactId>
...
...
spring-cloud-starter-ribbon/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-ribbon
</artifactId>
...
...
spring-cloud-starter-spectator/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-spectator
</artifactId>
...
...
spring-cloud-starter-turbine-amqp/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-turbine-amqp
</artifactId>
...
...
spring-cloud-starter-turbine-stream/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-turbine-stream
</artifactId>
...
...
spring-cloud-starter-turbine/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-turbine
</artifactId>
...
...
spring-cloud-starter-zuul/pom.xml
View file @
58e62ebd
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix
</artifactId>
<version>
1.3.
1
.BUILD-SNAPSHOT
</version>
<version>
1.3.
2
.BUILD-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<!-- lookup parent from repository -->
</parent>
<artifactId>
spring-cloud-starter-zuul
</artifactId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment