@@ -30,5 +30,10 @@
 		"com.kotcrab.remark:remark:jar:1.0.0:compile",
 		"com.fasterxml.jackson.core:jackson-annotations:jar:2.5.0:compile",
 		"org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:jar:0.2.0-SNAPSHOT:compile"
-	]
+	],
+	"java.sourceDirectories": [
+		"src/main/java",
+		"src/test/java"
+	],
+	"java.home": "/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home"
 }
@@ -153,24 +153,39 @@ function isJava8(javaExecutablePath: string): Promise<boolean> {
             resolve(eight);
         });
     });
-} 
+}
 
 function findJavaExecutable(binname: string) {
 	binname = correctBinname(binname);
 
-	// First search each JAVA_HOME bin folder
-	if (process.env['JAVA_HOME']) {
-		let workspaces = process.env['JAVA_HOME'].split(Path.delimiter);
-		for (let i = 0; i < workspaces.length; i++) {
-			let binpath = Path.join(workspaces[i], 'bin', binname);
-			if (FS.existsSync(binpath)) {
-				return binpath;
-			}
-		}
+	// First search java.home setting
+    let userJavaHome = VSCode.workspace.getConfiguration('java').get('home') as string;
+
+	if (userJavaHome != null) {
+        console.log('Looking for java in settings java.home ' + userJavaHome + '...');
+
+        let candidate = findJavaExecutableInJavaHome(userJavaHome, binname);
+
+        if (candidate != null)
+            return candidate;
+	}
+
+	// Then search each JAVA_HOME
+    let envJavaHome = process.env['JAVA_HOME'];
+
+	if (envJavaHome) {
+        console.log('Looking for java in environment variable JAVA_HOME ' + envJavaHome + '...');
+
+        let candidate = findJavaExecutableInJavaHome(envJavaHome, binname);
+
+        if (candidate != null)
+            return candidate;
 	}
 
 	// Then search PATH parts
 	if (process.env['PATH']) {
+        console.log('Looking for java in PATH');
+        
 		let pathparts = process.env['PATH'].split(Path.delimiter);
 		for (let i = 0; i < pathparts.length; i++) {
 			let binpath = Path.join(pathparts[i], binname);
@@ -191,6 +206,17 @@ function correctBinname(binname: string) {
 		return binname;
 }
 
+function findJavaExecutableInJavaHome(javaHome: string, binname: string) {
+    let workspaces = javaHome.split(Path.delimiter);
+
+    for (let i = 0; i < workspaces.length; i++) {
+        let binpath = Path.join(workspaces[i], 'bin', binname);
+
+        if (FS.existsSync(binpath)) 
+            return binpath;
+    }
+}
+
 // this method is called when your extension is deactivated
 export function deactivate() {
 }
@@ -68,6 +68,10 @@
                         "type": "string"
                     },
                     "description": "Java source directories in the workspace"
+                },
+                "java.home": {
+                    "type": "string",
+                    "description": "Installation directory of Java 8"
                 }
             }
         }
 
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 public class JavaSettings {
@@ -12,5 +13,6 @@ public class JavaSettings {
     public static class Java {
         public List<String> externalDependencies = new ArrayList<>();
         public List<Path> sourceDirectories = new ArrayList<>();
+        public Optional<String> javaHome = Optional.empty();
     }
 }
@@ -26,7 +26,9 @@ public class Main {
     public static final ObjectMapper JSON = new ObjectMapper().registerModule(new Jdk8Module())
                                                               .registerModule(new JSR310Module())
                                                               .registerModule(pathAsJson())
-                                                              .configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
+                                                              .configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false)
+                                                              .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                                                              .configure(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES, false);
 
     private static final Logger LOG = Logger.getLogger("main");
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@`
`68`	`68`	`"type": "string"`
`69`	`69`	`},`
`70`	`70`	`"description": "Java source directories in the workspace"`
	`71`	`+ },`
	`72`	`+ "java.home": {`
	`73`	`+ "type": "string",`
	`74`	`+ "description": "Installation directory of Java 8"`
`71`	`75`	`}`
`72`	`76`	`}`
`73`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import java.util.ArrayList;`
`5`	`5`	`import java.util.HashSet;`
`6`	`6`	`import java.util.List;`
	`7`	`+import java.util.Optional;`
`7`	`8`	`import java.util.Set;`
`8`	`9`
`9`	`10`	`public class JavaSettings {`
`@@ -12,5 +13,6 @@ public class JavaSettings {`
`12`	`13`	`public static class Java {`
`13`	`14`	`public List<String> externalDependencies = new ArrayList<>();`
`14`	`15`	`public List<Path> sourceDirectories = new ArrayList<>();`
	`16`	`+ public Optional<String> javaHome = Optional.empty();`
`15`	`17`	`}`
`16`	`18`	`}`