From ab8ff0e4f3b2fd39da81a7c24989bddc106ee7db Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 29 Jul 2015 11:19:05 -0400 Subject: [PATCH] polishing --- .../module/resolver/AetherModuleResolver.java | 13 +++++-------- .../stream/module/resolver/ModuleResolver.java | 4 ++-- .../module/resolver/AetherModuleResolverTests.java | 6 +++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java index 788f81d23..a2cd34d98 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java @@ -86,25 +86,22 @@ public class AetherModuleResolver implements ModuleResolver { * @param groupId the groupId * @param artifactId the artifactId * @param extension the file extension - * @param classifer classifier can be null if none + * @param classifier classifier can be null if none * @param version the version * @return a {@ link FileSystemResource} representing the resolved artifact in the local repository * @throws a RuntimeException if the artifact does not exist or the resolution fails */ @Override - public Resource resolve(String groupId, String artifactId, String extension, String classifer, String version) { + public Resource resolve(String groupId, String artifactId, String extension, String classifier, String version) { Assert.hasText(groupId, "'groupId' cannot be blank."); Assert.hasText(artifactId, "'artifactId' cannot be blank."); - Assert.hasText(extension, "'extension' cannot be blank."); - - if (classifer == null) { - classifer = ""; + if (classifier == null) { + classifier = ""; } - Assert.hasText(version, "'version' cannot be blank."); - Artifact artifact = new DefaultArtifact(groupId, artifactId, classifer, extension, version); + Artifact artifact = new DefaultArtifact(groupId, artifactId, classifier, extension, version); RepositorySystemSession session = newRepositorySystemSession(repositorySystem, localRepository.getAbsolutePath()); ArtifactResult result; diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java index 333483a51..a9b885967 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java @@ -31,10 +31,10 @@ public interface ModuleResolver { * @param groupId the groupId * @param artifactId the artifactId * @param extension the file extension - * @param classifer classifier + * @param classifier classifier * @param version the version * @return the resource */ - public Resource resolve(String groupId, String artifactId, String extension, String classifer, String version); + public Resource resolve(String groupId, String artifactId, String extension, String classifier, String version); } diff --git a/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java b/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java index a8e8da558..96a8b914d 100644 --- a/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java +++ b/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java @@ -51,7 +51,7 @@ public class AetherModuleResolverTests { ClassPathResource cpr = new ClassPathResource("local-repo"); File localRepository = cpr.getFile(); AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, null); - Resource resource = defaultModuleResolver.resolve("foo.bar", "foo-bar", "jar","","1.0.0"); + Resource resource = defaultModuleResolver.resolve("foo.bar", "foo-bar", "jar", "", "1.0.0"); assertTrue(resource.exists()); assertEquals(resource.getFile().getName(), "foo-bar-1.0.0.jar"); } @@ -61,7 +61,7 @@ public class AetherModuleResolverTests { ClassPathResource cpr = new ClassPathResource("local-repo"); File localRepository = cpr.getFile(); AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, null); - defaultModuleResolver.resolve("niente", "nada", "jar","", "zilch"); + defaultModuleResolver.resolve("niente", "nada", "jar", "", "zilch"); } @Test @@ -92,7 +92,7 @@ public class AetherModuleResolverTests { .withStatus(200) .withBodyFile(stubFileName))); AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, remoteRepos); - Resource resource = defaultModuleResolver.resolve("org.bar", "foo","jar", "", "1.0.0"); + Resource resource = defaultModuleResolver.resolve("org.bar", "foo", "jar", "", "1.0.0"); assertTrue(resource.exists()); assertEquals(resource.getFile().getName(), "foo-1.0.0.jar"); }