EPMRPP-90118 || Improve Email configuration to take into account possible deployment under path #1976
Conversation
…ible deployment under path
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -209,7 +213,8 @@ String mergeFinishLaunchText(String url, Launch launch, Set<ProjectIssueType> pr | |||
|
|
|||
| private String getUrl(String baseUrl) { | |||
| return ofNullable(rpHost).map(rh -> { | |||
| final UriComponents rpHostUri = UriComponentsBuilder.fromUriString(rh).build(); | |||
| String RPUrl = rpHost + path.replace("/api", ""); | |||
There was a problem hiding this comment.
Abbreviation in name 'RPUrl' must contain no more than '1' consecutive capital letters.
| @@ -209,7 +213,8 @@ | |||
|
|
|||
| private String getUrl(String baseUrl) { | |||
| return ofNullable(rpHost).map(rh -> { | |||
| final UriComponents rpHostUri = UriComponentsBuilder.fromUriString(rh).build(); | |||
| String RPUrl = rpHost + path.replace("/api", ""); | |||
…ible deployment under path
| @@ -107,7 +111,7 @@ public FinishLaunchRS finishLaunch(String launchId, FinishExecutionRQ finishLaun | |||
| FinishLaunchRS response = new FinishLaunchRS(); | |||
| response.setId(launch.getUuid()); | |||
| response.setNumber(launch.getNumber()); | |||
| response.setLink(generateLaunchLink(baseUrl, projectDetails.getProjectName(), | |||
| response.setLink(generateLaunchLink(baseUrl + path.replace("/api", ""), projectDetails.getProjectName(), | |||
There was a problem hiding this comment.
Line is longer than 100 characters (found 108).
…ible deployment under path
| @@ -209,7 +212,9 @@ String mergeFinishLaunchText(String url, Launch launch, Set<ProjectIssueType> pr | |||
|
|
|||
| private String getUrl(String baseUrl) { | |||
| return ofNullable(rpHost).map(rh -> { | |||
| final UriComponents rpHostUri = UriComponentsBuilder.fromUriString(rh).build(); | |||
| String processedPath = "/".equals(path) ? "" : path.replace("/api", ""); | |||
| String RPUrl = rpHost + processedPath; | |||
There was a problem hiding this comment.
Abbreviation in name 'RPUrl' must contain no more than '1' consecutive capital letters.
| @@ -209,7 +212,9 @@ | |||
|
|
|||
| private String getUrl(String baseUrl) { | |||
| return ofNullable(rpHost).map(rh -> { | |||
| final UriComponents rpHostUri = UriComponentsBuilder.fromUriString(rh).build(); | |||
| String processedPath = "/".equals(path) ? "" : path.replace("/api", ""); | |||
| String RPUrl = rpHost + processedPath; | |||
| @@ -33,8 +33,10 @@ private LinkGenerator() { | |||
| //static only | |||
| } | |||
|
|
|||
| public static String generateLaunchLink(String baseUrl, String projectName, String id) { | |||
| return StringUtils.isEmpty(baseUrl) ? null : baseUrl + UI_PREFIX + projectName + LAUNCHES + id; | |||
| public static String generateLaunchLink(String baseUrl, String path, String projectName, String id) { | |||
There was a problem hiding this comment.
Line is longer than 100 characters (found 103).
| @@ -33,8 +33,10 @@ | |||
| //static only | |||
| } | |||
|
|
|||
| public static String generateLaunchLink(String baseUrl, String projectName, String id) { | |||
| return StringUtils.isEmpty(baseUrl) ? null : baseUrl + UI_PREFIX + projectName + LAUNCHES + id; | |||
| public static String generateLaunchLink(String baseUrl, String path, String projectName, String id) { | |||
There was a problem hiding this comment.
Missing a Javadoc comment.
…ible deployment under path
…ible deployment under path
…ible deployment under path
No description provided.