Fixing stylecheck problems with maven-shade-clojure-transformer
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6ccf6a0a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6ccf6a0a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6ccf6a0a Branch: refs/heads/master Commit: 6ccf6a0a0954590e3db4c95a3f22b504a5a72757 Parents: 84084ab Author: Kishor Patil <[email protected]> Authored: Sun Apr 22 23:05:45 2018 -0400 Committer: Kishor Patil <[email protected]> Committed: Mon Apr 23 00:22:37 2018 -0400 ---------------------------------------------------------------------- .../maven-shade-clojure-transformer/pom.xml | 2 +- .../storm/maven/shade/clojure/ClojureTransformer.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6ccf6a0a/storm-buildtools/maven-shade-clojure-transformer/pom.xml ---------------------------------------------------------------------- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index cdb6fa8..b1e5616 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -42,7 +42,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>16</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/storm/blob/6ccf6a0a/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java ---------------------------------------------------------------------- diff --git a/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java b/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java index a24c67d..c2e6590 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java +++ b/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java @@ -15,10 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.storm.maven.shade.clojure; -import org.apache.maven.plugins.shade.relocation.Relocator; -import org.apache.maven.plugins.shade.resource.ResourceTransformer; +package org.apache.storm.maven.shade.clojure; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,6 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; +import org.apache.maven.plugins.shade.relocation.Relocator; +import org.apache.maven.plugins.shade.resource.ResourceTransformer; public class ClojureTransformer implements ResourceTransformer { @@ -35,7 +35,7 @@ public class ClojureTransformer implements ResourceTransformer { @Override public boolean canTransformResource(String s) { - if(s.endsWith(".clj")){ + if (s.endsWith(".clj")) { return true; } return false; @@ -46,12 +46,12 @@ public class ClojureTransformer implements ResourceTransformer { ByteArrayOutputStream out = new ByteArrayOutputStream(); int b; - while((b = inputStream.read()) != -1){ + while ((b = inputStream.read()) != -1) { out.write(b); } String data = out.toString(); - for(Relocator rel : relocators){ + for (Relocator rel : relocators) { data = rel.applyToSourceContent(data); } this.entries.put(s, data); @@ -64,7 +64,7 @@ public class ClojureTransformer implements ResourceTransformer { @Override public void modifyOutputStream(JarOutputStream jarOut) throws IOException { - for(String key : this.entries.keySet()){ + for (String key : this.entries.keySet()) { jarOut.putNextEntry(new JarEntry(key)); jarOut.write(this.entries.get(key).getBytes()); }
