From 6d6ad3dc6544c0944d39234b170e2a998bd96032 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 18 Dec 2014 17:09:11 +0000
Subject: [PATCH] Remove default URI for git repository

Application will fail fast if the URI is not set. It *is* however
still set to the sample repo in the -exec.jar that we distribute.

Fixes gh-51
---
 .../config/server/JGitEnvironmentRepository.java     | 12 ++++++++----
 .../src/main/resources/configserver.yml              |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
index eb34958f..2011c97b 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
@@ -42,6 +42,7 @@ import org.eclipse.jgit.transport.OpenSshConfig.Host;
 import org.eclipse.jgit.transport.SshSessionFactory;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.util.FileUtils;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.config.Environment;
 import org.springframework.cloud.config.PropertySource;
@@ -57,15 +58,13 @@ import com.jcraft.jsch.Session;
  *
  */
 @ConfigurationProperties("spring.cloud.config.server.git")
-public class JGitEnvironmentRepository implements EnvironmentRepository {
-
-	public static final String DEFAULT_URI = "https://github.com/spring-cloud-samples/config-repo";
+public class JGitEnvironmentRepository implements EnvironmentRepository, InitializingBean {
 
 	private static Log logger = LogFactory.getLog(JGitEnvironmentRepository.class);
 
 	private File basedir;
 
-	private String uri = DEFAULT_URI;
+	private String uri;
 
 	private ConfigurableEnvironment environment;
 
@@ -76,6 +75,11 @@ public class JGitEnvironmentRepository implements EnvironmentRepository {
 	private boolean initialized;
 
 	private String[] searchPaths = new String[0];
+	
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		Assert.state(uri!=null, "You need to configure a uri for the git repository");
+	}
 
 	public JGitEnvironmentRepository(ConfigurableEnvironment environment) {
 		this.environment = environment;
diff --git a/spring-cloud-config-server/src/main/resources/configserver.yml b/spring-cloud-config-server/src/main/resources/configserver.yml
index de081f2e..87fee6d7 100644
--- a/spring-cloud-config-server/src/main/resources/configserver.yml
+++ b/spring-cloud-config-server/src/main/resources/configserver.yml
@@ -5,6 +5,11 @@ spring:
     name: configserver
   jmx:
     default_domain: cloud.config.server
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/spring-cloud-samples/config-repo
 server:
   port: 8888
 management: