/*
 * Copyright 2019 Pivotal, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.netflix.spinnaker.kork.boot;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

public class DefaultPropertiesBuilder {
  private final Map<String, Object> defaults;

  public DefaultPropertiesBuilder() {
    defaults = new HashMap<>();
    defaults.put("netflix.environment", "test");
    defaults.put("netflix.account", "${netflix.environment}");
    defaults.put("netflix.stack", "test");
    defaults.put("spring.config.node", "${user.home}/.spinnaker/");
    defaults.put("spring.config.name", "${spring.application.name}");
    defaults.put("spring.profiles.active", "${netflix.environment},local");
    // add the Spring Cloud Config "composite" profile to default to a configuration
    // source that won't prevent app startup if custom configuration is not provided
    defaults.put("spring.profiles.include", "composite");
  }

  public DefaultPropertiesBuilder property(String key, Object value) {
    defaults.put(key, value);
    return this;
  }

  public Map<String, Object> build() {
    return Collections.unmodifiableMap(defaults);
  }
}

@@ -1061,109 +1061,134 @@
 ig.n
-od
+am
 e%22, %22
-$%7Buser.home%7D/.spinnaker/%22);%0A    defaults.put(%22spring.config.name%22, %22$%7Bspring.application.name%7D
+spinnaker,$%7Bspring.application.name%7D%22);%0A    defaults.put(%22spring.config.additional-location%22, %22$%7Buser.home%7D/.spinnaker/
 %22);%0A

Fix default property values (#337)