embulk 0.7.11-java → 0.8.0-java

data/embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java

@@ -18,8 +18,8 @@ import org.embulk.spi.PageReader;
 import org.embulk.spi.FileOutput;
 import org.embulk.spi.util.LineEncoder;
 import org.embulk.spi.util.Timestamps;
-
 import org.embulk.spi.util.Newline;
+import org.msgpack.value.Value;
 import java.util.Map;
 
 public class CsvFormatterPlugin
@@ -180,6 +180,17 @@ public class CsvFormatterPlugin
                             }
                         }
 
+                        public void jsonColumn(Column column)
+                        {
+                            addDelimiter(column);
+                            if (!pageReader.isNull(column)) {
+                                Value value = pageReader.getJson(column);
+                                addValue(value.toJson());
+                            } else {
+                                addNullString();
+                            }
+                        }
+
                         private void addDelimiter(Column column)
                         {
                             if (column.getIndex() != 0) {

data/embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java

@@ -13,6 +13,8 @@ import org.embulk.config.ConfigException;
 import org.embulk.config.TaskSource;
 import org.embulk.spi.time.TimestampParser;
 import org.embulk.spi.time.TimestampParseException;
+import org.embulk.spi.json.JsonParser;
+import org.embulk.spi.json.JsonParseException;
 import org.embulk.spi.Column;
 import org.embulk.spi.Schema;
 import org.embulk.spi.SchemaConfig;
@@ -229,6 +231,7 @@ public class CsvParserPlugin
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
         final TimestampParser[] timestampParsers = Timestamps.newTimestampColumnParsers(task, task.getSchemaConfig());
+        final JsonParser jsonParser = new JsonParser();
         final CsvTokenizer tokenizer = new CsvTokenizer(new LineDecoder(input, task), task);
         final String nullStringOrNull = task.getNullString().orNull();
         final boolean allowOptionalColumns = task.getAllowOptionalColumns();
@@ -320,6 +323,21 @@ public class CsvParserPlugin
                                 }
                             }
 
+                            public void jsonColumn(Column column)
+                            {
+                                String v = nextColumn();
+                                if (v == null) {
+                                    pageBuilder.setNull(column);
+                                } else {
+                                    try {
+                                        pageBuilder.setJson(column, jsonParser.parse(v));
+                                    } catch (JsonParseException e) {
+                                        // TODO support default value
+                                        throw new CsvRecordValidateException(e);
+                                    }
+                                }
+                            }
+
                             private String nextColumn()
                             {
                                 if (allowOptionalColumns && !tokenizer.hasNextColumn()) {

data/embulk-standards/src/main/java/org/embulk/standards/CsvTokenizer.java

@@ -252,7 +252,7 @@ public class CsvTokenizer
 
                     } else {
                         // this spaces are not trailing spaces. go back to VALUE state
-                        columnState = ColumnState.BEGIN;
+                        columnState = ColumnState.VALUE;
                     }
                     break;
 

data/embulk.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
     gem.platform = 'java'
 
   else
-    gem.add_dependency "jruby-jars", '= 9.0.0.0'
+    gem.add_dependency "jruby-jars", '= 9.0.4.0'
   end
 
   gem.add_development_dependency "rake", [">= 0.10.0"]

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 11 00:26:20 PDT 2015
+#Wed Jan 13 12:41:02 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

data/gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

data/lib/embulk/column.rb

@@ -57,6 +57,8 @@ module Embulk
         Java::Types::STRING
       when :timestamp
         Java::Types::TIMESTAMP
+      when :json
+        Java::Types::JSON
       else
         raise ArgumentError, "Unknown type #{ruby_type.inspect}: supported types are :boolean, :long, :double, :string and :timestamp"
       end

data/lib/embulk/command/embulk_migrate_plugin.rb

@@ -2,9 +2,9 @@ module Embulk
   def self.migrate_plugin(path)
     migrator = Migrator.new(path)
 
-    if ms = migrator.match("**/build.gradle", /org\.embulk:embulk-core:([\d\.]+)?/)
+    if ms = migrator.match("**/build.gradle", /org\.embulk:embulk-core:([\d\.\+]+)?/)
       lang = :java
-      from_ver = version(ms[0][1])
+      from_ver = version(ms[0][1].gsub(/\++/, '0'))   # replaces "0.8.+" to "0.8.0"
       puts "Detected Java plugin for Embulk #{from_ver}..."
 
     elsif ms = migrator.match("**/*.gemspec", /add_(?:development_)?dependency\s+\W+embulk\W+\s+([\d\.]+)\W+/)
@@ -42,12 +42,71 @@ module Embulk
       migrator.replace("**/*.java", /(commitReport)/, "taskReport")
     end
 
-    if migrator.match("gradle/wrapper/gradle-wrapper.properties", /gradle-2\.[12345]\W+/)
-      # gradle < 2.6
+    # upgrade gradle version
+    if migrator.match("gradle/wrapper/gradle-wrapper.properties", /gradle-2\.\d-/)
+      # gradle < 2.10 (\d matches one digit)
       require 'embulk/data/package_data'
       data = PackageData.new("new", migrator.path)
-      migrator.write "gradle/wrapper/gradle-wrapper.jar", data.bincontent("java/gradle/wrapper/gradle-wrapper.jar")
       migrator.write "gradle/wrapper/gradle-wrapper.properties", data.content("java/gradle/wrapper/gradle-wrapper.properties")
+      migrator.write "gradle/wrapper/gradle-wrapper.jar", data.bincontent("java/gradle/wrapper/gradle-wrapper.jar")
+    end
+
+    # add jsonColumn method
+    if !migrator.match("**/*.java", /void\s+jsonColumn/) && ms = migrator.match("**/*.java", /^(\W+).*?void\s+timestampColumn/)
+      indent = ms.first[1]
+      replace =  <<EOF
+
+#{indent}public void jsonColumn(Column column) {
+#{indent}    throw new UnsupportedOperationException("This plugin doesn't support json type. Please try to upgrade version of the plugin using 'embulk gem update' command. If the latest version still doesn't support json type, please contact plugin developers, or change configuration of input plugin not to use json type.");
+#{indent}}
+
+#{indent}@Override
+EOF
+      migrator.replace("**/*.java", /(\r?\n)(\W+).*?void\s+timestampColumn/, replace)
+    end
+
+    # add sourceCompatibility and targetCompatibility
+    unless migrator.match("build.gradle", /targetCompatibility/)
+      migrator.insert_line("build.gradle", /^([ \t]*)dependencies\s*{/) {|m|
+        "#{m[1]}targetCompatibility = 1.7\n"
+      }
+    end
+    unless migrator.match("build.gradle", /sourceCompatibility/)
+      migrator.insert_line("build.gradle", /^([ \t]*)targetCompatibility/) {|m|
+        "#{m[1]}sourceCompatibility = 1.7"
+      }
+    end
+
+    # add checkstyle
+    unless migrator.match("build.gradle", /id\s+(?<quote>["'])checkstyle\k<quote>/)
+      migrator.insert_line("build.gradle", /^([ \t]*)id( +)(["'])java["']/) {|m|
+        "#{m[1]}id#{m[2]}#{m[3]}checkstyle#{m[3]}"
+      }
+      migrator.write "config/checkstyle/checkstyle.xml", migrator.new_data.content("java/config/checkstyle/checkstyle.xml")
+    end
+
+    unless migrator.match("build.gradle", /checkstyle\s+{/)
+      migrator.write "config/checkstyle/default.xml", migrator.new_data.content("java/config/checkstyle/default.xml")
+      migrator.insert_line("build.gradle", /^([ \t]*)task\s+gem\W.*{/) {|m|
+        <<-EOF
+#{m[1]}checkstyle {
+#{m[1]}    configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
+#{m[1]}    toolVersion = '6.14.1'
+#{m[1]}}
+#{m[1]}checkstyleMain {
+#{m[1]}    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+#{m[1]}    ignoreFailures = true
+#{m[1]}}
+#{m[1]}checkstyleTest {
+#{m[1]}    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+#{m[1]}    ignoreFailures = true
+#{m[1]}}
+#{m[1]}task checkstyle(type: Checkstyle) {
+#{m[1]}    classpath = sourceSets.main.output + sourceSets.test.output
+#{m[1]}    source = sourceSets.main.allJava + sourceSets.test.allJava
+#{m[1]}}
+EOF
+      }
     end
 
     #
@@ -55,7 +114,7 @@ module Embulk
     ##
 
     # update version at the end
-    migrator.replace("**/build.gradle", /org\.embulk:embulk-(?:core|standards):([\d\.]+)?/, Embulk::VERSION)
+    migrator.replace("**/build.gradle", /org\.embulk:embulk-(?:core|standards):([\d\.\+]+)?/, Embulk::VERSION)
   end
 
   def self.migrate_ruby_plugin(migrator, from_ver)
@@ -63,7 +122,7 @@ module Embulk
     # add rules...
     ##
 
-    migrator.write(".ruby-version", "jruby-9.0.0.0")
+    migrator.write(".ruby-version", "jruby-9.0.4.0")
 
     # update version at the end
     if from_ver <= version("0.1.0")
@@ -86,9 +145,14 @@ module Embulk
     def initialize(path)
       @path = path
       @modified_files = {}
+
+      require 'fileutils'
+      require 'embulk/data/package_data'
+      @new_data = PackageData.new("new", path)
     end
 
     attr_reader :path
+    attr_reader :new_data
 
     def modified_files
       @modified_files.keys
@@ -124,13 +188,13 @@ module Embulk
       ms
     end
 
-    def insert_line(glob, pattern, text=nil)
+    def insert_line(glob, pattern, text: nil)
       ms = Dir[File.join(@path, glob)].map do |file|
         data = read(file)
         if m = data.match(pattern)
           ln = m.pre_match.split("\n").count
           replace = text || yield(m)
-          lines = data.split("\n")
+          lines = data.split("\n", -1)  # preserve the last empty line
           lines.insert(ln + 1, replace)
           data = lines.join("\n")
           modify(file, data)
@@ -146,7 +210,9 @@ module Embulk
     end
 
     def write(file, data)
-      modify(File.join(@path, file), data)
+      dst = File.join(@path, file)
+      FileUtils.mkdir_p File.dirname(dst)
+      modify(dst, data)
     end
 
     private

data/lib/embulk/command/embulk_new_plugin.rb

@@ -87,6 +87,8 @@ module Embulk
         pkg.cp("java/gradlew.bat", "gradlew.bat")
         pkg.cp("java/gradlew", "gradlew")
         pkg.set_executable("gradlew")
+        pkg.cp("java/config/checkstyle/checkstyle.xml","config/checkstyle/checkstyle.xml")
+        pkg.cp("java/config/checkstyle/default.xml","config/checkstyle/default.xml")
         pkg.cp_erb("java/build.gradle.erb", "build.gradle")
         pkg.cp_erb("java/plugin_loader.rb.erb", plugin_path)
         pkg.cp_erb("java/#{category}.java.erb", "src/main/java/#{java_package_name.gsub(/\./, '/')}/#{java_class_name}.java")

data/lib/embulk/command/embulk_run.rb

@@ -73,7 +73,7 @@ module Embulk
 
     case subcmd
     when :run
-      op.banner = "Usage: run <config.yml>"
+      op.banner = "Usage: embulk run <config.yml>"
       op.separator "  Options:"
       op.on('-r', '--resume-state PATH', 'Path to a file to write or read resume state') do |path|
         options[:resume_state_path] = path
@@ -86,9 +86,9 @@ module Embulk
       args = 1..1
 
     when :cleanup
-      op.banner = "Usage: cleanup <config.yml>"
+      op.banner = "Usage: embulk cleanup <config.yml>"
       op.separator "  Options:"
-      op.on('-r', '--resume-state PATH', 'Path to a file to write or read resume state') do |path|
+      op.on('-r', '--resume-state PATH', 'Path to a file to cleanup resume state') do |path|
         options[:resume_state_path] = path
       end
       plugin_load_ops.call
@@ -96,7 +96,7 @@ module Embulk
       args = 1..1
 
     when :preview
-      op.banner = "Usage: preview <config.yml>"
+      op.banner = "Usage: embulk preview <config.yml>"
       op.separator "  Options:"
       op.on('-G', '--vertical', "Use vertical output format", TrueClass) do |b|
         options[:format] = "vertical"
@@ -106,7 +106,7 @@ module Embulk
       args = 1..1
 
     when :guess
-      op.banner = "Usage: guess <partial-config.yml>"
+      op.banner = "Usage: embulk guess <partial-config.yml>"
       op.separator "  Options:"
       op.on('-o', '--output PATH', 'Path to a file to write the guessed configuration') do |path|
         options[:next_config_output_path] = path
@@ -119,7 +119,7 @@ module Embulk
       args = 1..1
 
     when :mkbundle
-      op.banner = "Usage: mkbundle <directory> [--path PATH]"
+      op.banner = "Usage: embulk mkbundle <directory> [--path PATH]"
       op.separator "  Options:"
       op.on('--path PATH', 'Relative path from <directory> for the location to install gems to (e.g. --path shared/bundle).') do |path|
         options[:bundle_path] = path
@@ -156,7 +156,7 @@ module Embulk
       system_exit_success
 
     when :new
-      op.banner = "Usage: new <category> <name>" + %[
+      op.banner = "Usage: embulk new <category> <name>" + %[
 categories:
     ruby-input                 Ruby record input plugin    (like "mysql")
     ruby-output                Ruby record output plugin   (like "mysql")
@@ -184,7 +184,7 @@ examples:
       args = 2..2
 
     when :migrate
-      op.banner = "Usage: migrate <directory>"
+      op.banner = "Usage: embulk migrate <directory>"
       args = 1..1
 
     when :selfupdate
@@ -429,11 +429,12 @@ examples:
 
   def self.usage(message)
     STDERR.puts "Embulk v#{Embulk::VERSION}"
-    STDERR.puts "usage: <command> [--options]"
-    STDERR.puts "commands:"
+    STDERR.puts "Usage: embulk [-vm-options] <command> [--options]"
+    STDERR.puts "Commands:"
     STDERR.puts "   mkbundle   <directory>                             # create a new plugin bundle environment."
     STDERR.puts "   bundle     [directory]                             # update a plugin bundle environment."
     STDERR.puts "   run        <config.yml>                            # run a bulk load transaction."
+    STDERR.puts "   cleanup    <config.yml>                            # cleanup resume state."
     STDERR.puts "   preview    <config.yml>                            # dry-run the bulk load without output and show preview."
     STDERR.puts "   guess      <partial-config.yml> -o <output.yml>    # guess missing parameters to create a complete configuration file."
     STDERR.puts "   gem        <install | list | help>                 # install a plugin or show installed plugins."
@@ -443,6 +444,12 @@ examples:
     STDERR.puts "   example    [path]                                  # creates an example config file and csv file to try embulk."
     STDERR.puts "   selfupdate [version]                               # upgrades embulk to the latest released version or to the specified version."
     STDERR.puts ""
+    STDERR.puts "VM options:"
+    STDERR.puts "   -J-O                             Disable JVM optimizations to speed up startup time (enabled by default if command is 'run')"
+    STDERR.puts "   -J+O                             Enable JVM optimizations to speed up throughput"
+    STDERR.puts "   -J...                            Set JVM options (use -J-help to see available options)"
+    STDERR.puts "   -R...                            Set JRuby options (use -R--help to see available options)"
+    STDERR.puts ""
     if message
       system_exit "error: #{message}"
     else

data/lib/embulk/data/bundle/.ruby-version

@@ -1 +1 @@
-jruby-9.0.0.0
+jruby-9.0.4.0

data/lib/embulk/data/new/java/build.gradle.erb

@@ -2,6 +2,7 @@ plugins {
     id "com.jfrog.bintray" version "1.1"
     id "com.github.jruby-gradle.base" version "0.1.5"
     id "java"
+    id "checkstyle"
 }
 import com.github.jrubygradle.JRubyExec
 repositories {
@@ -14,6 +15,9 @@ configurations {
 
 version = "0.1.0"
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 dependencies {
     compile  "org.embulk:embulk-core:<%= Embulk::VERSION %>"
     provided "org.embulk:embulk-core:<%= Embulk::VERSION %>"
@@ -28,6 +32,23 @@ task classpath(type: Copy, dependsOn: ["jar"]) {
 }
 clean { delete "classpath" }
 
+checkstyle {
+    configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
+    toolVersion = '6.14.1'
+}
+checkstyleMain {
+    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+    ignoreFailures = true
+}
+checkstyleTest {
+    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+    ignoreFailures = true
+}
+task checkstyle(type: Checkstyle) {
+    classpath = sourceSets.main.output + sourceSets.test.output
+    source = sourceSets.main.allJava + sourceSets.test.allJava
+}
+
 task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
     jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
     script "${project.name}.gemspec"

data/lib/embulk/data/new/java/config/checkstyle/checkstyle.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <!-- https://github.com/facebook/presto/blob/master/src/checkstyle/checks.xml -->
+    <module name="FileTabCharacter"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\r"/>
+        <property name="message" value="Line contains carriage return"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value=" \n"/>
+        <property name="message" value="Line has trailing whitespace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\{\n\n"/>
+        <property name="message" value="Blank line after opening brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\s*\}"/>
+        <property name="message" value="Blank line before closing brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\n"/>
+        <property name="message" value="Multiple consecutive blank lines"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\Z"/>
+        <property name="message" value="Blank line before end of file"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="Preconditions\.checkNotNull"/>
+        <property name="message" value="Use of checkNotNull"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+            <property name="tokens" value="
+                LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
+                LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
+        </module>
+        <module name="EmptyStatement"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="allowLineBreaks" value="true"/>
+            <property name="option" value="nospace"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly">
+            <property name="option" value="nl"/>
+            <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="option" value="eol"/>
+            <property name="tokens" value="
+                 LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
+                 LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="WhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+
+        <module name="UpperEll"/>
+        <module name="DefaultComesLast"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ModifierOrder"/>
+        <module name="OneStatementPerLine"/>
+        <module name="StringLiteralEquality"/>
+        <module name="MutableException"/>
+        <module name="EqualsHashCode"/>
+        <module name="InnerAssignment"/>
+        <module name="InterfaceIsType"/>
+        <module name="HideUtilityClassConstructor"/>
+
+        <module name="MemberName"/>
+        <module name="LocalVariableName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="TypeName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="*,javax,java"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="tokens" value="
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
+                LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+                LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
+                LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
+                STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+        </module>
+    </module>
+</module>