Merge branch 'codacy'

* codacy:
  Dockerfile: clean apt-get
  lint: Java (codacy)
  lint: shell style (codacy): use $() command substitution style
  lint: Java style (codacy): method DiffImage --> diffImage
  lint: Java style (codacy)
  migrate-from-ppy.py: jinja2 autoescape
  migrate-from-ppy.py: use defusedxml instead of lxml
  generate-e2e-test.py: change yaml.load() --> yaml.safe_load()
  migrate-from-ppy: unused code

Author: jeremydouglass

.docker/run-examples.sh

@@ -5,7 +5,7 @@
 # Input:
 #   $1 Log string.
 function log {
-  echo -e "[`date`] ${1}"
+  echo -e "[$(date)] ${1}"
 }
 
 root=$(dirname "${BASH_SOURCE}")/..

Dockerfile

@@ -5,10 +5,12 @@ RUN mkdir -p /code/runner
 
 # Install base package.
 RUN apt-get update && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
     curl \
-    ant
-
+    ant \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+  
 # Download Processing.
 # Dev operation: copy processing into the image.
 # COPY processing-3.3.3-linux64.tgz /code/processing.tgz

hack/generate-e2e-test.py

@@ -12,7 +12,7 @@ class Generator(object):
     def __init__(self):
         self.output_dir = e2e_test_dir
         self.reference_dir = reference_dir
-    
+
     def generate(self):
         for dirname in os.listdir(self.reference_dir):
             item_dir = os.path.join(self.reference_dir, dirname)
@@ -35,7 +35,7 @@ def generate(self):
         if os.path.isfile(yaml_file) is not True:
             return
         with open(yaml_file, 'r') as f:
-            config = yaml.load(f.read())
+            config = yaml.safe_load(f.read())
             print(config)
             builder.set_reference_url(config['test']['reference'])
 
@@ -72,7 +72,7 @@ def __init__(self, name):
     def set_core_code(self, code):
         self.coreCode = code
         return self
-    
+
     def set_reference_url(self, url):
         self.referenceURL = url
         return self

hack/migrate-from-ppy.py

@@ -1,9 +1,7 @@
 import click
 import os
-import lxml
-from lxml import etree
+from defusedxml import ElementTree as etree
 import jinja2
-import copy
 
 property_file_name = '.property.yml'
 property_template_dir = 'hack/templates'
@@ -31,7 +29,7 @@ def migrateItem(self, filename):
 
     def render(self, tree):
         property_template = jinja2.Environment(
-            loader=jinja2.FileSystemLoader(
+            autoescape=True, loader=jinja2.FileSystemLoader(
                 property_template_dir), trim_blocks='true')\
                 .get_template(property_template_file_name)
         subcategory = ''

scripts/deploy.sh

@@ -17,7 +17,7 @@ numberOfParams=2
 # Input:
 #   $1 Log string.
 function log {
-  echo -e "[`date`] ${1}"
+  echo -e "[$(date)] ${1}"
 }
 
 function help {
@@ -41,7 +41,7 @@ function deploy {
   commitid=$(git log -n1 --format="%h")
   version=${1}
   full_version=${2}
-  date=`date "+%Y/%m/%d %R"`
+  date=$(date "+%Y/%m/%d %R")
 
   perl -i -pe "s|\@\@mode-version\@\@|${version}|g" docs/RLangMode.txt
   perl -i -pe "s|\@\@pretty-version\@\@|${full_version}|g" docs/RLangMode.txt

scripts/utils/generator-util.sh

@@ -5,7 +5,7 @@
 # Input:
 #   $1 Log string.
 function log {
-  echo -e "[`date`] ${1}"
+  echo -e "[$(date)] ${1}"
 }
 
 function help {

src/rprocessing/Runner.java

@@ -131,8 +131,8 @@ public boolean accept(final File dir, final String name) {
     });
     if (dlls != null && dlls.length > 0) {
       entries.add(dir.getAbsolutePath());
-    } else {
-      // log("No DLLs in ", dir);
+    // } else {
+    //     log("No DLLs in ", dir);
     }
 
     final File[] jars = dir.listFiles(new FilenameFilter() {
@@ -145,8 +145,8 @@ public boolean accept(final File dir, final String name) {
       for (final File jar : jars) {
         entries.add(jar.getAbsolutePath());
       }
-    } else {
-      // log("No JARs in ", dir);
+    // } else {
+    //     log("No JARs in ", dir);
     }
 
     final File[] dirs = dir.listFiles(new FileFilter() {
@@ -159,8 +159,8 @@ public boolean accept(final File f) {
       for (final File d : dirs) {
         searchForExtraStuff(d, entries);
       }
-    } else {
-      // log("No dirs in ", dir);
+    // } else {
+    //   log("No dirs in ", dir);
     }
   }
 }

src/rprocessing/TreeCopier.java

@@ -43,20 +43,20 @@
 
 class TreeCopier implements FileVisitor<Path> {
 
+  private final Path source;
+  private final Path target;
+
   /**
    * Copy source file to target location.
    */
-  static void copyFile(final Path source, final Path target) {
+  private static void copyFile(final Path source, final Path target) {
     try {
       Files.copy(source, target, COPY_ATTRIBUTES, REPLACE_EXISTING);
     } catch (final IOException ioException) {
       System.err.format("Unable to copy: %s: %s%n", source, ioException);
     }
   }
 
-  private final Path source;
-  private final Path target;
-
   TreeCopier(final Path source, final Path target) {
     this.source = source;
     this.target = target;

src/rprocessing/exception/RSketchError.java

@@ -59,7 +59,8 @@ public String toString() {
   }
 
   // TODO: Support the line and column.
-  public static RSketchError toSketchException(Throwable t) {
+  public static RSketchError toSketchException(Throwable terr) {
+    Throwable t = terr;
     log(t.getClass().toString());
     if (t instanceof RuntimeException && t.getCause() != null) {
       t = t.getCause();

src/rprocessing/mode/RLangKeywordMap.java

@@ -80,15 +80,16 @@ protected int getSegmentMapKey(final Segment s, final int off, final int len) {
 
   // private members
   class Keyword {
+
+    public char[] keyword;
+    public byte id;
+    public Keyword next;
+
     public Keyword(final char[] keyword, final byte id, final Keyword next) {
       this.keyword = keyword;
       this.id = id;
       this.next = next;
     }
-
-    public char[] keyword;
-    public byte id;
-    public Keyword next;
   }
 
 }

src/test/e2e/core/E2eTestBase.java

@@ -23,7 +23,7 @@ protected String referenceImage(String path) throws MalformedURLException {
   }
 
   protected float diffImage(File file, String fileURL) throws MalformedURLException, IOException {
-    return ImageUtils.DiffImage(file, new URL(fileURL));
+    return ImageUtils.diffImage(file, new URL(fileURL));
   }
 
   protected float diffImageWithProcessingReference(File file, String referenceURL)

src/test/e2e/util/ImageUtils.java

@@ -14,7 +14,8 @@
  * @author github.com/gaocegege
  */
 public class ImageUtils {
-  public static float DiffImage(File actualFile, URL testURL) throws IOException {
+  
+  public static float diffImage(File actualFile, URL testURL) throws IOException {
     PImage actualImage = new PImage(ImageIO.read(actualFile));
     PImage testImage = new PImage(ImageIO.read(testURL));
 
@@ -28,11 +29,13 @@ private static float imgDifference(PImage i0, PImage i1) {
     i1.loadPixels();
     int[] ip1 = i1.pixels;
     for (int n = 0; n < ip0.length; n++) {
-      int pxl0 = ip0[n], r0, g0, b0;
-      int pxl1 = ip1[n], r1, g1, b1;
+      int pxl0 = ip0[n]
+      int r0, g0, b0;
       r0 = (pxl0 >> 20) & 0xF;
       g0 = (pxl0 >> 12) & 0xF;
       b0 = (pxl0 >> 4) & 0xF;
+      int pxl1 = ip1[n]
+      int r1, g1, b1;
       r1 = (pxl1 >> 20) & 0xF;
       g1 = (pxl1 >> 12) & 0xF;
       b1 = (pxl1 >> 4) & 0xF;