Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
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
DEMO
spring-boot
Commits
2ffe4804
Commit
2ffe4804
authored
Jun 16, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
cbae3136
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
InfluxDbAutoConfiguration.java
.../boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
+2
-2
MixedNeo4jRepositoriesAutoConfigurationTests.java
...a/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java
+3
-5
RedisAutoConfigurationTests.java
...autoconfigure/data/redis/RedisAutoConfigurationTests.java
+2
-1
InfluxDbAutoConfigurationTests.java
.../autoconfigure/influx/InfluxDbAutoConfigurationTests.java
+1
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
View file @
2ffe4804
...
...
@@ -53,8 +53,8 @@ public class InfluxDbAutoConfiguration {
if
(
Strings
.
isNullOrEmpty
(
this
.
properties
.
getUser
()))
{
return
InfluxDBFactory
.
connect
(
this
.
properties
.
getUrl
());
}
return
InfluxDBFactory
.
connect
(
this
.
properties
.
getUrl
(),
this
.
properties
.
getUser
(),
this
.
properties
.
getPassword
());
return
InfluxDBFactory
.
connect
(
this
.
properties
.
getUrl
(),
this
.
properties
.
get
User
(),
this
.
properties
.
get
Password
());
}
}
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java
View file @
2ffe4804
...
...
@@ -91,12 +91,10 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests {
assertThat
(
this
.
context
.
getBean
(
CityRepository
.
class
)).
isNotNull
();
}
private
void
load
(
Class
config
,
String
...
environment
)
{
private
void
load
(
Class
<?>
config
,
String
...
environment
)
{
AnnotationConfigApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
();
TestPropertyValues
.
of
(
environment
)
.
and
(
"spring.datasource.initialize"
,
"false"
)
.
and
(
"spring.data.neo4j.uri"
,
"http://localhost:8989"
)
.
applyTo
(
ctx
);
TestPropertyValues
.
of
(
environment
).
and
(
"spring.datasource.initialize"
,
"false"
)
.
and
(
"spring.data.neo4j.uri"
,
"http://localhost:8989"
).
applyTo
(
ctx
);
ctx
.
register
(
config
);
ctx
.
register
(
DataSourceAutoConfiguration
.
class
,
HibernateJpaAutoConfiguration
.
class
,
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
View file @
2ffe4804
...
...
@@ -86,7 +86,8 @@ public class RedisAutoConfigurationTests {
@Test
public
void
testCustomizeRedisConfiguration
()
{
load
(
CustomConfiguration
.
class
);
LettuceConnectionFactory
cf
=
this
.
context
.
getBean
(
LettuceConnectionFactory
.
class
);
LettuceConnectionFactory
cf
=
this
.
context
.
getBean
(
LettuceConnectionFactory
.
class
);
assertThat
(
cf
.
isUseSsl
()).
isTrue
();
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java
View file @
2ffe4804
...
...
@@ -50,8 +50,7 @@ public class InfluxDbAutoConfigurationTests {
@Test
public
void
influxDbCanBeCustomized
()
{
load
(
"spring.influx.url=http://localhost"
,
"spring.influx.password:password"
,
load
(
"spring.influx.url=http://localhost"
,
"spring.influx.password:password"
,
"spring.influx.user:user"
);
assertThat
(
this
.
context
.
getBeansOfType
(
InfluxDB
.
class
)).
hasSize
(
1
);
}
...
...
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