root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove some compiler warnings

This commit is contained in:
Dave Syer 2014-06-02 10:55:04 +01:00
parent cb89995153
commit efcbb32788
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
View File

@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.data.JpaRepositoriesAutoConfiguration;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration; import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java
View File

@ -152,7 +152,7 @@ public class JobLauncherCommandLineRunnerTests {
this.transactionManager); this.transactionManager);
public BatchConfiguration() throws Exception { public BatchConfiguration() throws Exception {
this.jobRepository = this.jobRepositoryFactory.getJobRepository(); this.jobRepository = this.jobRepositoryFactory.getObject();
} }
public void clear() { public void clear() {

10
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java
View File

@ -59,7 +59,6 @@ import org.springframework.boot.loader.tools.Layouts;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/** /**
* {@link Command} to create a self-contained executable jar file from a CLI application * {@link Command} to create a self-contained executable jar file from a CLI application
@ -211,10 +210,12 @@ public class JarCommand extends OptionParsingCommand {
private void addCliClasses(JarWriter writer) throws IOException { private void addCliClasses(JarWriter writer) throws IOException {
addClass(writer, PackagedSpringApplicationLauncher.class); addClass(writer, PackagedSpringApplicationLauncher.class);
Resource[] resources = new PathMatchingResourcePatternResolver().getResources("org/springframework/boot/groovy/**"); Resource[] resources = new PathMatchingResourcePatternResolver()
.getResources("org/springframework/boot/groovy/**");
for (Resource resource : resources) { for (Resource resource : resources) {
String url = resource.getURL().toString(); String url = resource.getURL().toString();
addResource(writer, resource, url.substring(url.indexOf("org/springframework/boot/groovy/"))); addResource(writer, resource,
url.substring(url.indexOf("org/springframework/boot/groovy/")));
} }
} }
@ -224,7 +225,8 @@ public class JarCommand extends OptionParsingCommand {
writer.writeEntry(name, stream); writer.writeEntry(name, stream);
} }
private void addResource(JarWriter writer, Resource resource, String name) throws IOException { private void addResource(JarWriter writer, Resource resource, String name)
throws IOException {
InputStream stream = resource.getInputStream(); InputStream stream = resource.getInputStream();
writer.writeEntry(name, stream); writer.writeEntry(name, stream);
} }