pull/1732/merge
Phillip Webb 10 years ago
parent 182ce21542
commit 2a8579026f

@ -160,7 +160,7 @@ public class MessageSourceAutoConfiguration {
classLoader = classLoader.getParent(); classLoader = classLoader.getParent();
} }
} }
catch (Throwable e) { catch (Throwable ex) {
} }
ROOT_CLASSLOADER = classLoader; ROOT_CLASSLOADER = classLoader;
} }

@ -16,6 +16,7 @@
package org.springframework.boot.cli.app; package org.springframework.boot.cli.app;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -36,7 +37,6 @@ public class SpringApplicationLauncher {
/** /**
* Creates a new launcher that will use the given {@code classLoader} to load * Creates a new launcher that will use the given {@code classLoader} to load
* {@code SpringApplication}. * {@code SpringApplication}.
*
* @param classLoader the {@code ClassLoader} to use * @param classLoader the {@code ClassLoader} to use
*/ */
public SpringApplicationLauncher(ClassLoader classLoader) { public SpringApplicationLauncher(ClassLoader classLoader) {
@ -46,7 +46,6 @@ public class SpringApplicationLauncher {
/** /**
* Launches the application created using the given {@code sources}. The application * Launches the application created using the given {@code sources}. The application
* is launched with the given {@code args}. * is launched with the given {@code args}.
*
* @param sources The sources for the application * @param sources The sources for the application
* @param args The args for the application * @param args The args for the application
* @return The application's {@code ApplicationContext} * @return The application's {@code ApplicationContext}
@ -55,10 +54,9 @@ public class SpringApplicationLauncher {
public Object launch(Object[] sources, String[] args) throws Exception { public Object launch(Object[] sources, String[] args) throws Exception {
Map<String, Object> defaultProperties = new HashMap<String, Object>(); Map<String, Object> defaultProperties = new HashMap<String, Object>();
defaultProperties.put("spring.groovy.template.check-template-location", "false"); defaultProperties.put("spring.groovy.template.check-template-location", "false");
Class<?> applicationClass = this.classLoader.loadClass(SPRING_APPLICATION_CLASS); Class<?> applicationClass = this.classLoader.loadClass(SPRING_APPLICATION_CLASS);
Object application = applicationClass.getConstructor(Object[].class).newInstance( Constructor<?> constructor = applicationClass.getConstructor(Object[].class);
(Object) sources); Object application = constructor.newInstance((Object) sources);
applicationClass.getMethod("setDefaultProperties", Map.class).invoke(application, applicationClass.getMethod("setDefaultProperties", Map.class).invoke(application,
defaultProperties); defaultProperties);
Method method = applicationClass.getMethod("run", String[].class); Method method = applicationClass.getMethod("run", String[].class);

@ -23,7 +23,11 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
/** /**
* @author dsyer * Thin wrapper to adapt {@link Gson} to a {@link JsonParser}.
*
* @author Dave Syer
* @since 1.2.0
* @see JsonParserFactory
*/ */
public class GsonJsonParser implements JsonParser { public class GsonJsonParser implements JsonParser {

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013 the original author or authors. * Copyright 2012-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013 the original author or authors. * Copyright 2012-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,7 @@
package org.springframework.boot.json; package org.springframework.boot.json;
/** /**
* Tests for {@link YamlJsonParser}. * Tests for {@link GsonJsonParser}.
* *
* @author Dave Syer * @author Dave Syer
*/ */

Loading…
Cancel
Save