Remove references to Assertion and AssertionUtil

* Replaces references with CoreArgCheck
Teiid-Designer · Dec 7, 2012 · 8a97fe9 · 8a97fe9
1 parent 3141bb0
commit 8a97fe9
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 486 deletions.
diff --git a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/IntegerID.java b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/IntegerID.java
@@ -23,8 +23,7 @@
 package org.teiid.core.designer.id;
 
 import java.io.Serializable;
-
-import org.teiid.core.util.Assertion;
+import org.teiid.core.designer.util.CoreArgCheck;
 
 
 /**
@@ -90,7 +89,7 @@ public boolean equals(Object obj) {
     @Override
 	public int compareTo(Object obj) {
         IntegerID that = (IntegerID) obj;     // May throw ClassCastException
-        Assertion.isNotNull(obj);
+        CoreArgCheck.isNotNull(obj);
 
         long diff = this.id - that.id;
         if ( diff < 0 ) {

diff --git a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/LongID.java b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/LongID.java
@@ -23,8 +23,7 @@
 package org.teiid.core.designer.id;
 
 import java.io.Serializable;
-
-import org.teiid.core.util.Assertion;
+import org.teiid.core.designer.util.CoreArgCheck;
 
 
 /**
@@ -90,7 +89,7 @@ public boolean equals(Object obj) {
     @Override
 	public int compareTo(Object obj) {
         LongID that = (LongID) obj;     // May throw ClassCastException
-        Assertion.isNotNull(obj);
+        CoreArgCheck.isNotNull(obj);
 
         long diff = this.id - that.id;
         if ( diff < 0 ) {

diff --git a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/StringID.java b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/StringID.java
@@ -23,8 +23,7 @@
 package org.teiid.core.designer.id;
 
 import java.io.Serializable;
-
-import org.teiid.core.util.Assertion;
+import org.teiid.core.designer.util.CoreArgCheck;
 
 
 /**
@@ -93,7 +92,8 @@ public boolean equals(Object obj) {
     @Override
 	public int compareTo(Object obj) {
         StringID that = (StringID) obj;     // May throw ClassCastException
-        Assertion.isNotNull(obj);
+        CoreArgCheck.isNotNull(obj);
+
         return this.id.compareTo(that.id);
     }
 

diff --git a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/UUID.java b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/id/UUID.java
@@ -24,7 +24,7 @@
 
 import java.io.Serializable;
 import org.teiid.core.designer.CoreModelerPlugin;
-import org.teiid.core.util.Assertion;
+import org.teiid.core.designer.util.CoreArgCheck;
 
 
 /**
@@ -82,8 +82,8 @@ public UUID(java.util.UUID uuid) {
      * @return first part of the UUID as a long
      */
     public static long getPart1(ObjectID id) {
-    	Assertion.assertTrue((id instanceof UUID), UNPARSABLE_MESSAGE);
-    	
+        CoreArgCheck.isInstanceOf(UUID.class, id, UNPARSABLE_MESSAGE);
+
     	UUID uuid = (UUID)id;
 	    return uuid.uuid.getMostSignificantBits();
     }
@@ -93,22 +93,22 @@ public static long getPart1(ObjectID id) {
      * @return first part of the UUID as a long
      */
     public static long getPart2(ObjectID id) {
-    	Assertion.assertTrue((id instanceof UUID), UNPARSABLE_MESSAGE);
+        CoreArgCheck.isInstanceOf(UUID.class, id, UNPARSABLE_MESSAGE);
 
     	UUID uuid = (UUID)id;
     	return uuid.uuid.getLeastSignificantBits();
     }
 
     public static int getVariant(ObjectID id ) {
-        Assertion.assertTrue((id instanceof UUID), NOT_UUID_MESSAGE);
-        
+        CoreArgCheck.isInstanceOf(UUID.class, id, NOT_UUID_MESSAGE);
+
         UUID uuid = (UUID)id;
         return uuid.uuid.variant();
     }
 
     public static int getVersion(ObjectID id ) {
-        Assertion.assertTrue((id instanceof UUID), NOT_UUID_MESSAGE);
-        
+        CoreArgCheck.isInstanceOf(UUID.class, id, NOT_UUID_MESSAGE);
+
         UUID uuid = (UUID)id;
         return uuid.uuid.version();
     }

diff --git a/.../org.teiid.designer.core/src/org/teiid/designer/core/container/DefaultResourceFinder.java b/.../org.teiid.designer.core/src/org/teiid/designer/core/container/DefaultResourceFinder.java
@@ -1105,8 +1105,8 @@ protected void processReferenceValue( final Resource eResource,
     }
 
     // protected URI getAbsoluteLocation(final URI baseLocationUri, final String location) {
-    // Assertion.isNotNull(baseLocationUri);
-    // Assertion.isNotNull(location);
+    // CoreArgCheck.isNotNull(baseLocationUri);
+    // CoreArgCheck.isNotNull(location);
     //        
     // // If the base resource URI was created as a file URI then it's path is encoded so before we
     // // resolve the referenced resource we need to encode it's relative path
@@ -1115,8 +1115,8 @@ protected void processReferenceValue( final Resource eResource,
     // }
     //   
     // protected URI getAbsoluteLocation(final URI baseLocationUri, final URI relativeLocationUri) {
-    // Assertion.isNotNull(baseLocationUri);
-    // Assertion.isNotNull(relativeLocationUri);
+    // CoreArgCheck.isNotNull(baseLocationUri);
+    // CoreArgCheck.isNotNull(relativeLocationUri);
     //        
     // URI locationUri = relativeLocationUri;
     // if (baseLocationUri.isHierarchical() && !baseLocationUri.isRelative() && locationUri.isRelative()) {

diff --git a/....relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java b/....relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java
@@ -885,7 +885,7 @@ protected void performExecute( final Context context,
             // // if ( parentNode != null ) {
             // // // Find the existing(!) model object that corresponds to the parent
             // // parent = (RelationalEntity)nodesToModelObjects.get(parentNode);
-            // // Assertion.isNotNull(parent);
+            // // CoreArgCheck.isNotNull(parent);
             // // }
             // //
             // // // Create the real object ...

diff --git a/...ins/org.teiid.designer.legacy/src/org/teiid/designer/core/index/RuntimeIndexSelector.java b/...ins/org.teiid.designer.legacy/src/org/teiid/designer/core/index/RuntimeIndexSelector.java
@@ -25,8 +25,6 @@
 import org.teiid.core.designer.util.CoreArgCheck;
 import org.teiid.core.designer.util.CoreStringUtil;
 import org.teiid.core.designer.util.FileUtils;
-import org.teiid.core.util.Assertion;
-import org.teiid.designer.core.util.AssertionUtil;
 import org.teiid.designer.core.util.FileUtil;
 import org.teiid.designer.core.util.TempDirectory;
 import org.teiid.designer.metadata.runtime.RuntimeMetadataPlugin;
@@ -81,7 +79,8 @@ public class RuntimeIndexSelector extends AbstractIndexSelector {
     public RuntimeIndexSelector( final String filePath ) {
         CoreArgCheck.isNotNull(filePath);
         this.vdbFile = new File(filePath);
-        Assertion.assertTrue(this.vdbFile.exists(), "No file/directory exists at the given location " + filePath); //$NON-NLS-1$
+
+        CoreArgCheck.isTrue(this.vdbFile.exists(), "No file/directory exists at the given location " + filePath); //$NON-NLS-1$
         checkForValidFile();
     }
 
@@ -110,7 +109,7 @@ public RuntimeIndexSelector( final String vdbName,
 
     private void checkForValidFile() {
         if (this.vdbFile.isFile()) {
-            Assertion.assertTrue(checkValidType(this.vdbFile),
+            CoreArgCheck.isTrue(checkValidType(this.vdbFile),
                                  "Invalid file type, expected an archive file or an index file " + vdbFile); //$NON-NLS-1$
         }
     }
@@ -503,7 +502,7 @@ public InputStream getFileContent( final String path,
                                        final String[] tokenReplacements ) {
         CoreArgCheck.isNotNull(tokens);
         CoreArgCheck.isNotNull(tokenReplacements);
-        AssertionUtil.isEqual(tokens.length, tokenReplacements.length);
+        CoreArgCheck.isEqual(tokens.length, tokenReplacements.length);
         String fileContents = getFileContentAsString(path);
         if (fileContents != null) {
             for (int i = 0; i < tokens.length; i++) {