mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge pull request #2707 from nebhale/vcap-service-numbers
* vcap-service-numbers: Support VcapApplicationListener Number Credentials
This commit is contained in:
commit
6d880cf7f8
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2014 the original author or authors.
|
* Copyright 2010-2015 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -213,6 +213,9 @@ public class VcapApplicationListener implements
|
|||||||
if (value instanceof String) {
|
if (value instanceof String) {
|
||||||
properties.put(key, value);
|
properties.put(key, value);
|
||||||
}
|
}
|
||||||
|
else if (value instanceof Number) {
|
||||||
|
properties.put(key, value.toString());
|
||||||
|
}
|
||||||
else if (value instanceof Map) {
|
else if (value instanceof Map) {
|
||||||
// Need a compound key
|
// Need a compound key
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2014 the original author or authors.
|
* Copyright 2012-2015 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -75,6 +75,10 @@ public class VcapApplicationListenerTests {
|
|||||||
this.initializer.onApplicationEvent(this.event);
|
this.initializer.onApplicationEvent(this.event);
|
||||||
assertEquals("mysql",
|
assertEquals("mysql",
|
||||||
this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
|
this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
|
||||||
|
assertEquals(
|
||||||
|
"3306",
|
||||||
|
this.context.getEnvironment().getProperty(
|
||||||
|
"vcap.services.mysql.credentials.port"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -86,5 +90,9 @@ public class VcapApplicationListenerTests {
|
|||||||
this.initializer.onApplicationEvent(this.event);
|
this.initializer.onApplicationEvent(this.event);
|
||||||
assertEquals("mysql",
|
assertEquals("mysql",
|
||||||
this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
|
this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
|
||||||
|
assertEquals(
|
||||||
|
"3306",
|
||||||
|
this.context.getEnvironment().getProperty(
|
||||||
|
"vcap.services.mysql.credentials.port"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user