parent
afb67887da
commit
e6d5f5a271
|
|
@ -161,7 +161,7 @@ public final class WebMvcTags {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a {@code exception} tag based on the {@link Class#getSimpleName() simple
|
* Creates an {@code exception} tag based on the {@link Class#getSimpleName() simple
|
||||||
* name} of the class of the given {@code exception}.
|
* name} of the class of the given {@code exception}.
|
||||||
* @param exception the exception, may be {@code null}
|
* @param exception the exception, may be {@code null}
|
||||||
* @return the exception tag derived from the exception
|
* @return the exception tag derived from the exception
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ class ProjectGenerationRequest {
|
||||||
|
|
||||||
private String bootVersion;
|
private String bootVersion;
|
||||||
|
|
||||||
private List<String> dependencies = new ArrayList<>();
|
private final List<String> dependencies = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The URL of the service to use.
|
* The URL of the service to use.
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public class BootJar extends Jar implements BootArchive {
|
||||||
|
|
||||||
private static final String BOOT_INF_LAYERS = "BOOT-INF/layers";
|
private static final String BOOT_INF_LAYERS = "BOOT-INF/layers";
|
||||||
|
|
||||||
private List<String> dependencies = new ArrayList<>();
|
private final List<String> dependencies = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@code BootJar} task.
|
* Creates a new {@code BootJar} task.
|
||||||
|
|
@ -111,22 +111,11 @@ public class BootJar extends Jar implements BootArchive {
|
||||||
}
|
}
|
||||||
|
|
||||||
private File createClasspathIndex(List<String> dependencies) {
|
private File createClasspathIndex(List<String> dependencies) {
|
||||||
try {
|
String content = dependencies.stream().collect(Collectors.joining("\n", "", "\n"));
|
||||||
StringWriter content = new StringWriter();
|
File source = getProject().getResources().getText().fromString(content).asFile();
|
||||||
BufferedWriter writer = new BufferedWriter(content);
|
File indexFile = new File(source.getParentFile(), "classpath.idx");
|
||||||
for (String dependency : dependencies) {
|
source.renameTo(indexFile);
|
||||||
writer.write(dependency);
|
return indexFile;
|
||||||
writer.write("\n");
|
|
||||||
}
|
|
||||||
writer.flush();
|
|
||||||
File source = getProject().getResources().getText().fromString(content.toString()).asFile();
|
|
||||||
File indexFile = new File(source.getParentFile(), "classpath.idx");
|
|
||||||
source.renameTo(indexFile);
|
|
||||||
return indexFile;
|
|
||||||
}
|
|
||||||
catch (IOException ex) {
|
|
||||||
throw new RuntimeException("Failed to create classpath.idx", ex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -411,11 +411,6 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
|
||||||
this.libPath + "third-library.jar");
|
this.libPath + "third-library.jar");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
void libEntriesAreStored() throws IOException {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected File jarFile(String name) throws IOException {
|
protected File jarFile(String name) throws IOException {
|
||||||
File file = newFile(name);
|
File file = newFile(name);
|
||||||
try (JarOutputStream jar = new JarOutputStream(new FileOutputStream(file))) {
|
try (JarOutputStream jar = new JarOutputStream(new FileOutputStream(file))) {
|
||||||
|
|
|
||||||
|
|
@ -326,7 +326,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||||
/**
|
/**
|
||||||
* Provides access to the java binary executable, regardless of OS.
|
* Provides access to the java binary executable, regardless of OS.
|
||||||
* @return the java executable
|
* @return the java executable
|
||||||
**/
|
*/
|
||||||
protected String getJavaExecutable() {
|
protected String getJavaExecutable() {
|
||||||
Toolchain toolchain = this.toolchainManager.getToolchainFromBuildContext("jdk", this.session);
|
Toolchain toolchain = this.toolchainManager.getToolchainFromBuildContext("jdk", this.session);
|
||||||
String javaExecutable = (toolchain != null) ? toolchain.findTool("java") : null;
|
String javaExecutable = (toolchain != null) ? toolchain.findTool("java") : null;
|
||||||
|
|
|
||||||
|
|
@ -329,7 +329,7 @@ public class WebServiceTemplateBuilder {
|
||||||
* @param messageFactory the message factory to use for creating messages
|
* @param messageFactory the message factory to use for creating messages
|
||||||
* @return a new builder instance.
|
* @return a new builder instance.
|
||||||
* @see WebServiceTemplate#setMessageFactory(WebServiceMessageFactory)
|
* @see WebServiceTemplate#setMessageFactory(WebServiceMessageFactory)
|
||||||
**/
|
*/
|
||||||
public WebServiceTemplateBuilder setWebServiceMessageFactory(WebServiceMessageFactory messageFactory) {
|
public WebServiceTemplateBuilder setWebServiceMessageFactory(WebServiceMessageFactory messageFactory) {
|
||||||
Assert.notNull(messageFactory, "MessageFactory must not be null");
|
Assert.notNull(messageFactory, "MessageFactory must not be null");
|
||||||
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
||||||
|
|
@ -342,7 +342,7 @@ public class WebServiceTemplateBuilder {
|
||||||
* @param unmarshaller the message unmarshaller
|
* @param unmarshaller the message unmarshaller
|
||||||
* @return a new builder instance.
|
* @return a new builder instance.
|
||||||
* @see WebServiceTemplate#setUnmarshaller(Unmarshaller)
|
* @see WebServiceTemplate#setUnmarshaller(Unmarshaller)
|
||||||
**/
|
*/
|
||||||
public WebServiceTemplateBuilder setUnmarshaller(Unmarshaller unmarshaller) {
|
public WebServiceTemplateBuilder setUnmarshaller(Unmarshaller unmarshaller) {
|
||||||
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
||||||
this.customizers, this.messageSenders, this.marshaller, unmarshaller, this.destinationProvider,
|
this.customizers, this.messageSenders, this.marshaller, unmarshaller, this.destinationProvider,
|
||||||
|
|
@ -354,7 +354,7 @@ public class WebServiceTemplateBuilder {
|
||||||
* @param marshaller the message marshaller
|
* @param marshaller the message marshaller
|
||||||
* @return a new builder instance.
|
* @return a new builder instance.
|
||||||
* @see WebServiceTemplate#setMarshaller(Marshaller)
|
* @see WebServiceTemplate#setMarshaller(Marshaller)
|
||||||
**/
|
*/
|
||||||
public WebServiceTemplateBuilder setMarshaller(Marshaller marshaller) {
|
public WebServiceTemplateBuilder setMarshaller(Marshaller marshaller) {
|
||||||
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
return new WebServiceTemplateBuilder(this.detectHttpMessageSender, this.interceptors, this.internalCustomizers,
|
||||||
this.customizers, this.messageSenders, marshaller, this.unmarshaller, this.destinationProvider,
|
this.customizers, this.messageSenders, marshaller, this.unmarshaller, this.destinationProvider,
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||||
*/
|
*/
|
||||||
@ClassPathExclusions("hibernate-validator-*.jar")
|
@ClassPathExclusions("hibernate-validator-*.jar")
|
||||||
@ClassPathOverrides("javax.validation:validation-api:2.0.1.Final")
|
@ClassPathOverrides("javax.validation:validation-api:2.0.1.Final")
|
||||||
class JavaxApiValidationExceptionFailureAnalyzerTests2 {
|
class JavaxApiValidationExceptionFailureAnalyzerTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void validatedPropertiesTest() {
|
void validatedPropertiesTest() {
|
||||||
Loading…
Reference in New Issue