Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ignite.incubator.apache.org
Received-SPF: pass (athena.apache.org: local policy)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.incubator.apache.org
Date: Thu, 23 Apr 2015 16:12:56 -0000
Message-Id: <6c729da3ecdc4dadadf544ef5d7b4fee@git.apache.org>
In-Reply-To: <d72dd98c5ad844858d11aeaefce783f3@git.apache.org>
References: <d72dd98c5ad844858d11aeaefce783f3@git.apache.org>
Subject: [16/50] incubator-ignite git commit: # IGNITE-748 Fixed split by dot.

# IGNITE-748 Fixed split by dot.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d165b08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d165b08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d165b08

Branch: refs/heads/ignite-646
Commit: 6d165b08dc0c15163935729508161b2d4f93480f
Parents: 94b2fa7
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Apr 22 11:01:06 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Apr 22 11:01:06 2015 +0700

----------------------------------------------------------------------
 .../ignite/schema/generator/CodeGenerator.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d165b08/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index de02bcd..c4fe111 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -63,15 +63,19 @@ public class CodeGenerator {
      * Checks if string is a valid java identifier.
      *
      * @param identifier String to check.
+     * @param split If {@code true} then identifier will be split by dots.
      * @param msg Identifier type.
      * @param type Checked type.
      * @throws IllegalStateException If passed string is not valid java identifier.
      */
-    private static void checkValidJavaIdentifier(String identifier, String msg, String type) throws IllegalStateException{
+    private static void checkValidJavaIdentifier(String identifier, boolean split, String msg, String type)
+        throws IllegalStateException{
         if (identifier.isEmpty())
             throw new IllegalStateException(msg + " could not be empty!");
 
-        for (String part : identifier.split("\\.")) {
+        String[] parts = split ? identifier.split("\\.") : new String[] {identifier};
+
+        for (String part : parts) {
             if (javaKeywords.contains(part))
                 throw new IllegalStateException(msg + " could not contains reserved keyword:" +
                     " [type = " + type + ", identifier=" + identifier + ", keyword=" + part + "]");
@@ -254,8 +258,8 @@ public class CodeGenerator {
 
         File out = new File(pkgFolder, type + ".java");
 
-        checkValidJavaIdentifier(pkg, "Package", type);
-        checkValidJavaIdentifier(type, "Type", type);
+        checkValidJavaIdentifier(pkg, true, "Package", type);
+        checkValidJavaIdentifier(type, false, "Type", type);
 
         if (out.exists()) {
             MessageBox.Result choice = askOverwrite.confirm(out.getName());
@@ -281,7 +285,7 @@ public class CodeGenerator {
         for (PojoField field : fields) {
             String fldName = field.javaName();
 
-            checkValidJavaIdentifier(fldName, "Field", type);
+            checkValidJavaIdentifier(fldName, false, "Field", type);
 
             add1(src, "/** Value for " + fldName + ". */");
 
@@ -539,7 +543,7 @@ public class CodeGenerator {
      * @param varName Variable name to generate.
      * @param mtdName Method name to generate.
      * @param comment Commentary text.
-     * @param first {@code true} if varable should be declared.
+     * @param first {@code true} if variable should be declared.
      */
     private static void addQueryFields(Collection<String> src, Collection<PojoField> fields, String varName,
         String mtdName, String comment, boolean first) {