Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Allow to substitute key/value using a system property, otherwise use the default value for the server.port #986

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow to substitute key/value using a system property, otherwise use the default value for the server.port #986

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
655feed
Allow to substitute key/value using a system property, otherwise use …
cmoulliard Jul 13, 2017
6f68cc1
To be reviewed
cmoulliard Oct 2, 2017
72c6ce2
To be reviewed
cmoulliard Oct 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions .../spring-boot/src/main/java/io/fabric8/maven/generator/springboot/SpringBootGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;
import java.util.*;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
Expand All @@ -45,6 +40,8 @@
import com.google.common.base.Strings;

import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.text.StrMatcher;
import org.apache.commons.lang3.text.StrSubstitutor;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -61,6 +58,9 @@ public class SpringBootGenerator extends JavaExecGenerator {

private static final String SPRING_BOOT_MAVEN_PLUGIN_GA = "org.springframework.boot:spring-boot-maven-plugin";
private static final String DEFAULT_SERVER_PORT = "8080";
private static final StrMatcher DEFAULT_PREFIX = StrMatcher.stringMatcher("${");
private static final StrMatcher DEFAULT_SUFFIX = StrMatcher.stringMatcher("}");
private static final StrMatcher DEFAULT_VALUE_DELIMITER = StrMatcher.stringMatcher(":");

public enum Config implements Configs.Key {
color {{ d = "false"; }};
Expand Down Expand Up @@ -124,12 +124,36 @@ protected List<String> extractPorts() {
List<String> answer = new ArrayList<>();
Properties properties = SpringBootUtil.getSpringBootApplicationProperties(this.getProject());
String port = properties.getProperty(SpringBootProperties.SERVER_PORT, DEFAULT_SERVER_PORT);
addPortIfValid(answer, getConfig(JavaExecGenerator.Config.webPort, port));
addPortIfValid(answer, getConfig(JavaExecGenerator.Config.webPort, replaceKeyWithSystemPropertyValue(port)));
addPortIfValid(answer, getConfig(JavaExecGenerator.Config.jolokiaPort));
addPortIfValid(answer, getConfig(JavaExecGenerator.Config.prometheusPort));
return answer;
}

/**
* Look within all the System Properties if there is a property which corresponds to the key passed
* If a match exists, then replace the value otherwise use the default value defined within ${key:default-value}
* Example
* my.server.port=7777 is a system property that we will search in order to replace its value within the key passed to the method.
* If the key is "server.port: ${my.server.port:6666}", then "my.server.port" value will be substituted, otherwise the default value is used
* "6666"
*
* @param key The string containing the key to search
* @return String The modified key
*/
protected static String replaceKeyWithSystemPropertyValue(String key) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it make sense to respect Maven properties, too ? They would have been replaced if used without default value, but with default value this (e.g. with the ':') this is not recognized by maven as a property. So I would add project.getProperties() to the argument list, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Nicola proposed also that we support maven properties and system properties where maven props override system props, I will update the PR accordingly.

Nicola suggested too to move the code of the method replaceKeyWithSystemPropertyValue to the class SpringBootUtil packaged within f-m-p core. Do you agree too @nicolaferraro @rhuss ?

HashMap values = new HashMap();
Properties systemProperties = System.getProperties();
for(Map.Entry<Object, Object> x : systemProperties.entrySet()) {
values.put(x.getKey(),x.getValue());
}
StrSubstitutor sub = new StrSubstitutor(values);
sub.setValueDelimiterMatcher(DEFAULT_VALUE_DELIMITER);
sub.setVariablePrefixMatcher(DEFAULT_PREFIX);
sub.setVariableSuffixMatcher(DEFAULT_SUFFIX);
return sub.replace(key);
}

// =============================================================================

private void ensureSpringDevToolSecretToken() throws MojoExecutionException {
Expand Down