From 47935c96bf0d2b789cc16e0633ec7d0f48bcd0b8 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 25 Mar 2019 12:09:30 -0700 Subject: [PATCH] Fix for https://www.pivotaltracker.com/n/projects/1346850/stories/164862665 Do not use 'https' for local request mappings. --- .../java/requestmapping/LiveAppURLSymbolProvider.java | 2 -- .../ide/vscode/boot/java/requestmapping/UrlUtil.java | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java index 7043a3980..063c7ce5c 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java @@ -36,8 +36,6 @@ public class LiveAppURLSymbolProvider { } public List getSymbols(String query) { - System.out.println(query); - List result = new ArrayList<>(); try { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java index 1bebb265a..8fd0a97a2 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java @@ -12,8 +12,15 @@ package org.springframework.ide.vscode.boot.java.requestmapping; import org.springframework.ide.vscode.commons.util.StringUtil; +import com.google.common.collect.ImmutableSet; + public class UrlUtil { + private static final ImmutableSet LOCALHOST_ALIASES = ImmutableSet.of( + "localhost", + "127.0.0.1" + ); + /** * Creates http URL string based on host, port and path * @param host @@ -40,7 +47,7 @@ public class UrlUtil { if (port.equals("80")) { return "http://"+host+path; } else { - if ("localhost".equals(host)) { + if (LOCALHOST_ALIASES.contains(host)) { return "http://" + host + ":" + port + path; } else { return "https://" + host + ":" + port + path;