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
3bd563e4
Unverified
Commit
3bd563e4
authored
Jun 10, 2016
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove h2 test dep
parent
525c5852
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
36 deletions
+9
-36
pom.xml
spring-cloud-netflix-core/pom.xml
+0
-10
ArchaiusAutoConfigurationTests.java
...loud/netflix/archaius/ArchaiusAutoConfigurationTests.java
+2
-2
TestArchaiusExternalConfiguration.java
...d/netflix/archaius/TestArchaiusExternalConfiguration.java
+7
-24
No files found.
spring-cloud-netflix-core/pom.xml
View file @
3bd563e4
...
...
@@ -179,16 +179,6 @@
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-jdbc
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.h2database
</groupId>
<artifactId>
h2
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.aspectj
</groupId>
<artifactId>
aspectjweaver
</artifactId>
<optional>
true
</optional>
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java
View file @
3bd563e4
...
...
@@ -94,9 +94,9 @@ public class ArchaiusAutoConfigurationTests {
}
@Test
public
void
configurationWithInjected
Db
Configuration
()
throws
Exception
{
public
void
configurationWithInjectedConfiguration
()
throws
Exception
{
this
.
context
=
new
AnnotationConfigApplicationContext
(
ArchaiusAutoConfiguration
.
class
,
ArchaiusExternalConfiguration
.
class
);
ArchaiusAutoConfiguration
.
class
,
Test
ArchaiusExternalConfiguration
.
class
);
DynamicStringProperty
dbProperty
=
DynamicPropertyFactory
.
getInstance
()
.
getStringProperty
(
"db.property"
,
null
);
DynamicStringProperty
secondDbProperty
=
DynamicPropertyFactory
.
getInstance
()
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusExternalConfiguration.java
→
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/
Test
ArchaiusExternalConfiguration.java
View file @
3bd563e4
...
...
@@ -16,43 +16,26 @@
package
org
.
springframework
.
cloud
.
netflix
.
archaius
;
import
com.netflix.config.DynamicConfiguration
;
import
com.netflix.config.FixedDelayPollingScheduler
;
import
com.netflix.config.PolledConfigurationSource
;
import
com.netflix.config.sources.JDBCConfigurationSource
;
import
org.apache.commons.configuration.AbstractConfiguration
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.jdbc.datasource.SingleConnectionDataSource
;
import
com.netflix.config.ConcurrentMapConfiguration
;
/**
* @author Alexandru-George Burghelea
*/
@Configuration
public
class
ArchaiusExternalConfiguration
{
public
class
Test
ArchaiusExternalConfiguration
{
@Bean
@Qualifier
(
"dynamicConfiguration"
)
public
AbstractConfiguration
createDynamicConfiguration
()
{
PolledConfigurationSource
source
=
new
JDBCConfigurationSource
(
initDataSource
(),
"select distinct property_key, property_value from properties"
,
"property_key"
,
"property_value"
);
return
new
DynamicConfiguration
(
source
,
new
FixedDelayPollingScheduler
(
0
,
1000
,
false
));
}
@Bean
@Qualifier
(
"dataSource"
)
public
SingleConnectionDataSource
initDataSource
()
{
SingleConnectionDataSource
dataSource
=
new
SingleConnectionDataSource
();
dataSource
.
setDriverClassName
(
"org.h2.Driver"
);
dataSource
.
setUrl
(
"jdbc:h2:mem:test_archaius;AUTOCOMMIT=ON;DB_CLOSE_DELAY=-1;MODE=PostgreSQL;INIT=RUNSCRIPT FROM 'classpath:archaius_db_store.sql'"
);
dataSource
.
setUsername
(
"sa"
);
dataSource
.
setPassword
(
""
);
dataSource
.
setSuppressClose
(
true
);
return
dataSource
;
ConcurrentMapConfiguration
config
=
new
ConcurrentMapConfiguration
();
config
.
addProperty
(
"db.property"
,
"this is a db property"
);
config
.
addProperty
(
"db.second.property"
,
"this is another db property"
);
return
config
;
}
}
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