Merge remote-tracking branch 'origin/1.4.x'

.circleci/config.yml

@@ -0,0 +1,40 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-config-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-oconfig-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/EnvironmentControllerTests.java

@@ -203,6 +203,20 @@ public class EnvironmentControllerTests {
 		assertThat(environment.getPropertySources().get(1).getSource().entrySet(),
 				hasSize(3));
 	}
+	
+	@Test
+	public void testNameWithSlash() {
+		this.controller.labelled("foo(_)spam", "bar", "two");
+		
+		Mockito.verify(this.repository).findOne("foo/spam", "bar", "two");
+	}
+
+	@Test
+	public void testLabelWithSlash() {
+		this.controller.labelled("foo", "bar", "two(_)spam");
+		
+		Mockito.verify(this.repository).findOne("foo", "bar", "two/spam");
+	}
 
 	@Test
 	public void arrayOverridenInYaml() throws Exception {