From 629dea419e58507dd14f79f9903e2fe45f215ad6 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 12 Jun 2007 16:01:29 +0000
Subject: [PATCH] refactor: simplify parseColumnDefinition()

SVN: 481
---
 .../ch/systemsx/cisd/common/db/DBRestrictions.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/common/source/java/ch/systemsx/cisd/common/db/DBRestrictions.java b/common/source/java/ch/systemsx/cisd/common/db/DBRestrictions.java
index 3f956f16fd8..96711733239 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/DBRestrictions.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/DBRestrictions.java
@@ -190,20 +190,13 @@ public class DBRestrictions
                         .group(1)));
             }
         }
-        final int nullIdx = findInArray(words, "null", 3);
-        if (nullIdx > 0 && "not".equals(words[nullIdx - 1]))
+        final int nullIdx = ArrayUtils.indexOf(words, "null", 3);
+        if (nullIdx != ArrayUtils.INDEX_NOT_FOUND && "not".equals(words[nullIdx - 1]))
         {
             getTableRestrictions(tableName).notNullSet.add(columnName);
         }
     }
 
-    private int findInArray(String[] array, String term, int firstIndex)
-    {
-        assert array != null;
-        assert term != null;
-        return ArrayUtils.indexOf(array, term, firstIndex);
-    }
-
     private void parserCheckedConstraints(List<String> ddlScript)
     {
         for (String line : ddlScript)
-- 
GitLab