From 22ce84048f23c012f0aba21b06b61d1aeed522ec Mon Sep 17 00:00:00 2001 From: shawkins Date: Sun, 18 Sep 2016 18:14:09 -0400 Subject: [PATCH] TEIID-4450 consolidating version class --- .../main/java/org/teiid/util}/Version.java | 4 +- ...actInfinispanManagedConnectionFactory.java | 2 +- .../hotrod/InfinispanConnectionImpl.java | 2 +- .../TestInfinispanConfigFileRemoteCache.java | 7 +- .../InfinispanCacheRAConnection.java | 2 +- .../InfinispanManagedConnectionFactory.java | 2 +- .../hive/ImpalaExecutionFactory.java | 2 +- .../InfinispanHotRodExecutionFactory.java | 3 +- .../query/domain/PersonCacheConnection.java | 2 +- .../query/domain/PersonCacheSource.java | 2 +- .../hotrod/TestInfinispanExecution.java | 4 +- .../TestInfinispanExecutionFactory.java | 5 +- .../TestInfinispanHotRodConnection.java | 2 +- .../TestAnnotationMetadataProcessor.java | 4 +- .../InfinispanLibModeExecutionFactory.java | 2 +- .../TestInfinispanConfigFileKeySearch.java | 6 +- .../TestInfinispanConnectionHelper.java | 2 +- .../translator/jdbc/JDBCExecutionFactory.java | 1 + .../jdbc/db2/DB2ExecutionFactory.java | 2 +- .../jdbc/derby/DerbyExecutionFactory.java | 2 +- .../jdbc/hana/HanaExecutionFactory.java | 2 +- .../jdbc/hsql/HsqlExecutionFactory.java | 2 +- .../jdbc/mysql/MySQL5ExecutionFactory.java | 2 +- .../jdbc/netezza/NetezzaExecutionFactory.java | 2 +- .../jdbc/oracle/OracleExecutionFactory.java | 1 + .../PostgreSQLExecutionFactory.java | 1 + .../sqlserver/SQLServerExecutionFactory.java | 2 +- .../jdbc/sybase/SybaseExecutionFactory.java | 2 +- .../jdbc/sybase/SybaseIQExecutionFactory.java | 2 +- .../jdbc/teiid/TeiidExecutionFactory.java | 2 +- .../jdbc/TestJDBCExecutionFactory.java | 1 + .../jdbc/db2/TestDB2SqlTranslator.java | 2 +- .../jdbc/derby/TestDerbyCapabilities.java | 2 +- .../jdbc/derby/TestDerbySQLTranslator.java | 2 +- .../jdbc/hana/TestHanaTranslator.java | 2 +- .../jdbc/oracle/TestOracleTranslator.java | 2 +- .../postgresql/TestPostgreSQLTranslator.java | 2 +- .../sybase/TestSybaseConvertModifier.java | 2 +- .../TestSybaseSQLConversionVisitor.java | 2 +- .../mongodb/MongoDBExecutionFactory.java | 1 + .../org/teiid/translator/mongodb/Version.java | 117 ------------------ .../mongodb/TestMongoDBQueryExecution.java | 1 - .../translator/object/ObjectConnection.java | 1 + .../org/teiid/translator/object/Version.java | 117 ------------------ .../simpleMap/SimpleMapCacheConnection.java | 4 +- .../annotated/TestObjectConnection.java | 2 +- .../annotated/TradesAnnotatedCacheSource.java | 3 +- .../trades/TradeObjectConnection.java | 2 +- .../testdata/trades/TradesCacheSource.java | 2 +- .../odata/TestODataQueryExecution.java | 1 - .../teiid/dqp/internal/process/TestTPCR.java | 2 +- 51 files changed, 55 insertions(+), 291 deletions(-) rename {connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc => api/src/main/java/org/teiid/util}/Version.java (97%) delete mode 100644 connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/Version.java delete mode 100644 connectors/translator-object/src/main/java/org/teiid/translator/object/Version.java diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Version.java b/api/src/main/java/org/teiid/util/Version.java similarity index 97% rename from connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Version.java rename to api/src/main/java/org/teiid/util/Version.java index 4ededced00..9c9986fcce 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/Version.java +++ b/api/src/main/java/org/teiid/util/Version.java @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.translator.jdbc; +package org.teiid.util; import java.util.ArrayList; import java.util.Arrays; @@ -67,7 +67,7 @@ public static Version getVersion(String version) { return new Version(versionParts.toArray(new Integer[versionParts.size()])); } - Version(Integer[] parts) { + public Version(Integer[] parts) { this.parts = parts; } diff --git a/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/AbstractInfinispanManagedConnectionFactory.java b/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/AbstractInfinispanManagedConnectionFactory.java index 139a5f0912..a0d388c6ee 100644 --- a/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/AbstractInfinispanManagedConnectionFactory.java +++ b/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/AbstractInfinispanManagedConnectionFactory.java @@ -48,7 +48,7 @@ import org.teiid.translator.infinispan.hotrod.InfinispanPlugin; import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; public abstract class AbstractInfinispanManagedConnectionFactory extends diff --git a/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/InfinispanConnectionImpl.java b/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/InfinispanConnectionImpl.java index c8c10fe143..5006aeb8ae 100644 --- a/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/InfinispanConnectionImpl.java +++ b/connectors/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/InfinispanConnectionImpl.java @@ -42,7 +42,7 @@ import org.teiid.translator.infinispan.hotrod.InfinispanPlugin; import org.teiid.translator.object.DDLHandler; import org.teiid.translator.object.SearchType; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; /** diff --git a/connectors/connector-infinispan-hotrod/src/test/java/org/teiid/resource/adapter/infinispan/hotrod/TestInfinispanConfigFileRemoteCache.java b/connectors/connector-infinispan-hotrod/src/test/java/org/teiid/resource/adapter/infinispan/hotrod/TestInfinispanConfigFileRemoteCache.java index b2ff9a1aef..ec1634230e 100644 --- a/connectors/connector-infinispan-hotrod/src/test/java/org/teiid/resource/adapter/infinispan/hotrod/TestInfinispanConfigFileRemoteCache.java +++ b/connectors/connector-infinispan-hotrod/src/test/java/org/teiid/resource/adapter/infinispan/hotrod/TestInfinispanConfigFileRemoteCache.java @@ -21,20 +21,17 @@ */ package org.teiid.resource.adapter.infinispan.hotrod; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.io.File; import java.util.Properties; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.teiid.core.util.PropertiesUtils; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") diff --git a/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java b/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java index f29b20121a..de192220c4 100644 --- a/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java +++ b/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java @@ -39,7 +39,7 @@ import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.DDLHandler; import org.teiid.translator.object.SearchType; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; /** * @author vanhalbert diff --git a/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java b/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java index 3f6b587d9f..4572ba4ed1 100644 --- a/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java +++ b/connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java @@ -48,7 +48,7 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; public class InfinispanManagedConnectionFactory extends BasicManagedConnectionFactory { diff --git a/connectors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java b/connectors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java index caaf5d2336..ddea8719fb 100644 --- a/connectors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java +++ b/connectors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java @@ -39,7 +39,7 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.AliasModifier; import org.teiid.translator.jdbc.FunctionModifier; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name="impala", description="A translator for Coludera's Impala based database on HDFS") public class ImpalaExecutionFactory extends BaseHiveExecutionFactory { diff --git a/connectors/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanHotRodExecutionFactory.java b/connectors/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanHotRodExecutionFactory.java index dcfcfd8dbe..c186444514 100644 --- a/connectors/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanHotRodExecutionFactory.java +++ b/connectors/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanHotRodExecutionFactory.java @@ -33,11 +33,10 @@ import org.teiid.translator.Translator; import org.teiid.translator.TranslatorException; import org.teiid.translator.TranslatorProperty; -import org.teiid.translator.infinispan.hotrod.metadata.AnnotationMetadataProcessor; import org.teiid.translator.infinispan.hotrod.metadata.ProtobufMetadataProcessor; import org.teiid.translator.object.ObjectConnection; import org.teiid.translator.object.ObjectExecutionFactory; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheConnection.java b/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheConnection.java index 7505db0d49..8e35983068 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheConnection.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheConnection.java @@ -30,7 +30,7 @@ import org.teiid.translator.infinispan.hotrod.TestInfinispanHotRodConnection; import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; /** * @author vanhalbert diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheSource.java b/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheSource.java index 1122667b7a..450240fc62 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheSource.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheSource.java @@ -49,7 +49,7 @@ import org.infinispan.query.dsl.Query; import org.teiid.translator.infinispan.hotrod.InfinispanHotRodConnection; import org.teiid.translator.object.ClassRegistry; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; /** * Sample cache of objects diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecution.java b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecution.java index f0a97d2afc..cb32fecd5f 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecution.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecution.java @@ -22,7 +22,7 @@ package org.teiid.translator.infinispan.hotrod; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; @@ -37,8 +37,8 @@ import org.teiid.translator.ExecutionContext; import org.teiid.translator.TranslatorException; import org.teiid.translator.object.ObjectExecution; -import org.teiid.translator.object.Version; import org.teiid.translator.object.testdata.person.PersonSchemaVDBUtility; +import org.teiid.util.Version; /** * NOTES: diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecutionFactory.java b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecutionFactory.java index b56a518eca..5f597b67b2 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecutionFactory.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanExecutionFactory.java @@ -21,8 +21,7 @@ */ package org.teiid.translator.infinispan.hotrod; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import org.jboss.as.quickstarts.datagrid.hotrod.query.domain.PersonCacheSource; import org.junit.Before; @@ -32,8 +31,8 @@ import org.teiid.language.Select; import org.teiid.translator.ExecutionContext; import org.teiid.translator.object.ObjectExecution; -import org.teiid.translator.object.Version; import org.teiid.translator.object.testdata.person.PersonSchemaVDBUtility; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestInfinispanExecutionFactory { diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanHotRodConnection.java b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanHotRodConnection.java index 07f703640f..c462f5dee6 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanHotRodConnection.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanHotRodConnection.java @@ -32,10 +32,10 @@ import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; import org.teiid.translator.object.simpleMap.SimpleMapCacheConnection; import org.teiid.translator.object.testdata.annotated.Trade; import org.teiid.translator.object.testdata.annotated.TradesAnnotatedCacheSource; +import org.teiid.util.Version; /** * @author vanhalbert diff --git a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/metadata/TestAnnotationMetadataProcessor.java b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/metadata/TestAnnotationMetadataProcessor.java index dc90d46d2f..ae76a0bee5 100644 --- a/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/metadata/TestAnnotationMetadataProcessor.java +++ b/connectors/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/metadata/TestAnnotationMetadataProcessor.java @@ -1,6 +1,6 @@ package org.teiid.translator.infinispan.hotrod.metadata; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.Properties; @@ -16,7 +16,7 @@ import org.teiid.translator.infinispan.hotrod.InfinispanHotRodExecutionFactory; import org.teiid.translator.object.ObjectConnection; import org.teiid.translator.object.ObjectExecutionFactory; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestAnnotationMetadataProcessor { diff --git a/connectors/translator-infinispan-libmode/src/main/java/org/teiid/translator/infinispan/libmode/InfinispanLibModeExecutionFactory.java b/connectors/translator-infinispan-libmode/src/main/java/org/teiid/translator/infinispan/libmode/InfinispanLibModeExecutionFactory.java index 628b0011b8..37013b7cda 100644 --- a/connectors/translator-infinispan-libmode/src/main/java/org/teiid/translator/infinispan/libmode/InfinispanLibModeExecutionFactory.java +++ b/connectors/translator-infinispan-libmode/src/main/java/org/teiid/translator/infinispan/libmode/InfinispanLibModeExecutionFactory.java @@ -35,8 +35,8 @@ import org.teiid.translator.object.ObjectExecutionFactory; import org.teiid.translator.object.ObjectUpdateExecution; import org.teiid.translator.object.ObjectVisitor; -import org.teiid.translator.object.Version; import org.teiid.translator.object.simpleMap.SimpleKeyVisitor; +import org.teiid.util.Version; /** * InfinispanExecutionFactory is the "infinispan-lib-mode" translator that is used to access an Infinispan cache running in library mode. diff --git a/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConfigFileKeySearch.java b/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConfigFileKeySearch.java index d0cbd3ff98..5bd69e8022 100644 --- a/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConfigFileKeySearch.java +++ b/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConfigFileKeySearch.java @@ -21,8 +21,8 @@ */ package org.teiid.translator.infinispan.libmode; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import org.junit.AfterClass; import org.junit.Before; @@ -33,8 +33,8 @@ import org.teiid.translator.object.BasicSearchTest; import org.teiid.translator.object.ObjectConnection; import org.teiid.translator.object.ObjectExecution; -import org.teiid.translator.object.Version; import org.teiid.translator.object.testdata.trades.VDBUtility; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestInfinispanConfigFileKeySearch extends BasicSearchTest { diff --git a/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConnectionHelper.java b/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConnectionHelper.java index 277a8bc3d1..f68e62ceed 100644 --- a/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConnectionHelper.java +++ b/connectors/translator-infinispan-libmode/src/test/java/org/teiid/translator/infinispan/libmode/TestInfinispanConnectionHelper.java @@ -12,9 +12,9 @@ import org.infinispan.transaction.TransactionMode; import org.teiid.core.TeiidException; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; import org.teiid.translator.object.testdata.annotated.TradesAnnotatedCacheSource; import org.teiid.translator.object.testdata.trades.TradesCacheSource; +import org.teiid.util.Version; public class TestInfinispanConnectionHelper { diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java index 03a4425867..7ba8a752d3 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java @@ -60,6 +60,7 @@ import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.RuntimeMetadata; import org.teiid.translator.*; +import org.teiid.util.Version; /** diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2ExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2ExecutionFactory.java index 668eb9d970..8aa46abbf1 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2ExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2ExecutionFactory.java @@ -36,7 +36,7 @@ import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.AliasModifier; import org.teiid.translator.jdbc.FunctionModifier; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name="db2", description="A translator for IBM DB2 Database") public class DB2ExecutionFactory extends BaseDB2ExecutionFactory { diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java index 5124ab0c50..2858f3346b 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java @@ -35,9 +35,9 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.EscapeSyntaxModifier; -import org.teiid.translator.jdbc.Version; import org.teiid.translator.jdbc.db2.BaseDB2ExecutionFactory; import org.teiid.translator.jdbc.oracle.LeftOrRightFunctionModifier; +import org.teiid.util.Version; /** * @since 4.3 diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java index 8ae84bf19c..8b73d35d22 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java @@ -45,7 +45,7 @@ import org.teiid.translator.jdbc.LocateFunctionModifier; import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TemplateFunctionModifier; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name = "hana", description = "SAP HANA translator") public class HanaExecutionFactory extends JDBCExecutionFactory { diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlExecutionFactory.java index 1c19b98e40..4760ea76b0 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hsql/HsqlExecutionFactory.java @@ -38,7 +38,7 @@ import org.teiid.translator.jdbc.ConvertModifier; import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.JDBCExecutionFactory; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name="hsql", description="A translator for open source HSQL Database") public class HsqlExecutionFactory extends JDBCExecutionFactory { diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java index 9daa8d45dc..661481537d 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java @@ -40,7 +40,7 @@ import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.AliasModifier; import org.teiid.translator.jdbc.FunctionModifier; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name="mysql5", description="A translator for open source MySQL5 Database") public class MySQL5ExecutionFactory extends MySQLExecutionFactory { diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java index 8403b2b73d..83ad0ef80a 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java @@ -44,7 +44,7 @@ import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.LocateFunctionModifier; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @Translator(name = "netezza", description = "A translator for Netezza Database") diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java index efb1faaa78..233ad4292b 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java @@ -63,6 +63,7 @@ import org.teiid.translator.TypeFacility; import org.teiid.translator.TypeFacility.RUNTIME_CODES; import org.teiid.translator.jdbc.*; +import org.teiid.util.Version; @Translator(name="oracle", description="A translator for Oracle 9i Database or later") diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java index 59a700a4c4..39a41a3632 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java @@ -56,6 +56,7 @@ import org.teiid.translator.jdbc.oracle.LeftOrRightFunctionModifier; import org.teiid.translator.jdbc.oracle.MonthOrDayNameFunctionModifier; import org.teiid.translator.jdbc.oracle.OracleFormatFunctionModifier; +import org.teiid.util.Version; diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java index 5cb998a5fb..961e702a8b 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java @@ -53,8 +53,8 @@ import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.JDBCMetdataProcessor; -import org.teiid.translator.jdbc.Version; import org.teiid.translator.jdbc.sybase.SybaseExecutionFactory; +import org.teiid.util.Version; /** * Updated to assume the use of the DataDirect, 2005 driver, or later. diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java index 4555990f7f..cce4a137df 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java @@ -59,8 +59,8 @@ import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.ModFunctionModifier; import org.teiid.translator.jdbc.ParseFormatFunctionModifier; -import org.teiid.translator.jdbc.Version; import org.teiid.translator.jdbc.oracle.ConcatFunctionModifier; +import org.teiid.util.Version; @Translator(name="sybase", description="A translator for Sybase Database") diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java index b847779b2e..e1521c3dca 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java @@ -16,9 +16,9 @@ import org.teiid.translator.jdbc.ConvertModifier; import org.teiid.translator.jdbc.EscapeSyntaxModifier; import org.teiid.translator.jdbc.FunctionModifier; -import org.teiid.translator.jdbc.Version; import org.teiid.translator.jdbc.hsql.AddDiffModifier; import org.teiid.translator.jdbc.oracle.ConcatFunctionModifier; +import org.teiid.util.Version; /** * A translator for Sybase IQ 15.1+ diff --git a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java index c8659b6579..c5fc9e9a56 100644 --- a/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java +++ b/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java @@ -49,7 +49,7 @@ import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.JDBCMetdataProcessor; import org.teiid.translator.jdbc.SQLDialect; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; /** * @since 4.3 diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestJDBCExecutionFactory.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestJDBCExecutionFactory.java index d763f64c5b..8bb2c3c117 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestJDBCExecutionFactory.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestJDBCExecutionFactory.java @@ -39,6 +39,7 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.JDBCExecutionFactory.StructRetrieval; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestJDBCExecutionFactory { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java index 6f02526f5f..1051d3b886 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java @@ -35,7 +35,7 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestDB2SqlTranslator { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java index 3cb552a270..d92ffebc44 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java @@ -25,7 +25,7 @@ import static org.junit.Assert.*; import org.junit.Test; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; public class TestDerbyCapabilities { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java index d37b659d52..136b49515e 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestDerbySQLTranslator { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaTranslator.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaTranslator.java index 121587e395..f9b33542f3 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaTranslator.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaTranslator.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestHanaTranslator { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java index fd4bf5ecad..9f74fea139 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java @@ -71,7 +71,7 @@ import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestOracleTranslator { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java index 0062378b83..2cb5f86ac1 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java @@ -32,7 +32,7 @@ import org.teiid.translator.SourceSystemFunctions; import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; @SuppressWarnings("nls") public class TestPostgreSQLTranslator { diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java index 0d68992e80..1a01878802 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java @@ -38,7 +38,7 @@ import org.teiid.query.unittest.TimestampUtil; import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.SQLConversionVisitor; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; /** diff --git a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java index 1670c28f2c..3d0b9c50ab 100644 --- a/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java +++ b/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java @@ -33,7 +33,7 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; -import org.teiid.translator.jdbc.Version; +import org.teiid.util.Version; /** */ diff --git a/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java b/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java index 07eb4c1563..bc102a105b 100644 --- a/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java +++ b/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java @@ -62,6 +62,7 @@ import org.teiid.translator.*; import org.teiid.translator.jdbc.AliasModifier; import org.teiid.translator.jdbc.FunctionModifier; +import org.teiid.util.Version; import com.mongodb.AggregationOptions; import com.mongodb.BasicDBList; diff --git a/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/Version.java b/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/Version.java deleted file mode 100644 index 62813e647b..0000000000 --- a/connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/Version.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.translator.mongodb; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.teiid.core.util.StringUtil; - -/** - * Represents a comparable version - */ -public class Version implements Comparable { - - public static Version DEFAULT_VERSION = new Version(new Integer[] {0}); - private static final Pattern NUMBER_PATTERN = Pattern.compile("(\\d+)"); //$NON-NLS-1$ - - private Integer[] parts; - - public static Version getVersion(String version) { - if (version == null) { - return null; - } - String[] parts = version.split("\\."); //$NON-NLS-1$ - List versionParts = new ArrayList(); - for (String part : parts) { - Integer val = null; - Matcher m = NUMBER_PATTERN.matcher(part); - if (!m.find()) { - continue; - } - - String num = m.group(1); - try { - val = Integer.parseInt(num); - } catch (NumberFormatException e) { - - } - versionParts.add(val == null ? 0 : val); - } - if (versionParts.isEmpty()) { - return DEFAULT_VERSION; - } - return new Version(versionParts.toArray(new Integer[versionParts.size()])); - } - - Version(Integer[] parts) { - this.parts = parts; - } - - @Override - public String toString() { - return StringUtil.toString(this.parts, ".", false); //$NON-NLS-1$ - } - - public int getMajorVersion() { - return parts[0]; - } - - @Override - public int compareTo(Version o) { - int length = Math.min(this.parts.length, o.parts.length); - for (int i = 0; i < length; i++) { - int comp = this.parts[i].compareTo(o.parts[i]); - if (comp != 0) { - return comp; - } - } - if (this.parts.length > length) { - return 1; - } - if (o.parts.length > length) { - return -1; - } - return 0; - } - - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof Version)) { - return false; - } - return this.compareTo((Version)obj) == 0; - } - - @Override - public int hashCode() { - return Arrays.hashCode(parts); - } - -} diff --git a/connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBQueryExecution.java b/connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBQueryExecution.java index 2a910633d5..8f60d05f92 100644 --- a/connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBQueryExecution.java +++ b/connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBQueryExecution.java @@ -1154,7 +1154,6 @@ public void testSubStr2() throws Exception { params.add(4); DBObject ne = buildNE("$CategoryName", null); - System.out.println(ne); BasicDBObject func = new BasicDBObject("$substr", params); BasicDBObject expr = buildCondition(ne, func, null); diff --git a/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectConnection.java b/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectConnection.java index 92f59c36e7..992e1b6d8d 100644 --- a/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectConnection.java +++ b/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectConnection.java @@ -24,6 +24,7 @@ import java.util.Collection; import org.teiid.translator.TranslatorException; +import org.teiid.util.Version; /** * Each ObjectConnection implementation represents a connection to a single cache. diff --git a/connectors/translator-object/src/main/java/org/teiid/translator/object/Version.java b/connectors/translator-object/src/main/java/org/teiid/translator/object/Version.java deleted file mode 100644 index c265054bd6..0000000000 --- a/connectors/translator-object/src/main/java/org/teiid/translator/object/Version.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.translator.object; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.teiid.core.util.StringUtil; - -/** - * Represents a comparable version - */ -public class Version implements Comparable { - - public static Version DEFAULT_VERSION = new Version(new Integer[] {0}); - private static final Pattern NUMBER_PATTERN = Pattern.compile("(\\d+)"); //$NON-NLS-1$ - - private Integer[] parts; - - public static Version getVersion(String version) { - if (version == null) { - return null; - } - String[] parts = version.split("\\."); //$NON-NLS-1$ - List versionParts = new ArrayList(); - for (String part : parts) { - Integer val = null; - Matcher m = NUMBER_PATTERN.matcher(part); - if (!m.find()) { - continue; - } - - String num = m.group(1); - try { - val = Integer.parseInt(num); - } catch (NumberFormatException e) { - - } - versionParts.add(val == null ? 0 : val); - } - if (versionParts.isEmpty()) { - return DEFAULT_VERSION; - } - return new Version(versionParts.toArray(new Integer[versionParts.size()])); - } - - Version(Integer[] parts) { - this.parts = parts; - } - - @Override - public String toString() { - return StringUtil.toString(this.parts, ".", false); //$NON-NLS-1$ - } - - public int getMajorVersion() { - return parts[0]; - } - - @Override - public int compareTo(Version o) { - int length = Math.min(this.parts.length, o.parts.length); - for (int i = 0; i < length; i++) { - int comp = this.parts[i].compareTo(o.parts[i]); - if (comp != 0) { - return comp; - } - } - if (this.parts.length > length) { - return 1; - } - if (o.parts.length > length) { - return -1; - } - return 0; - } - - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof Version)) { - return false; - } - return this.compareTo((Version)obj) == 0; - } - - @Override - public int hashCode() { - return Arrays.hashCode(parts); - } - -} diff --git a/connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheConnection.java b/connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheConnection.java index 81c6ed1924..3f15960f4d 100644 --- a/connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheConnection.java +++ b/connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheConnection.java @@ -8,10 +8,10 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; -import org.teiid.translator.object.ObjectConnection; import org.teiid.translator.object.DDLHandler; +import org.teiid.translator.object.ObjectConnection; import org.teiid.translator.object.SearchType; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; public class SimpleMapCacheConnection implements ObjectConnection { private Version version = Version.getVersion("0.0.0"); diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TestObjectConnection.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TestObjectConnection.java index f4fbb9f16a..5875a5e08f 100644 --- a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TestObjectConnection.java +++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TestObjectConnection.java @@ -5,8 +5,8 @@ import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; import org.teiid.translator.object.simpleMap.SimpleMapCacheConnection; +import org.teiid.util.Version; public class TestObjectConnection extends SimpleMapCacheConnection { diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java index bb3d3c822b..c7ceafe7c8 100644 --- a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java +++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java @@ -28,10 +28,9 @@ import java.util.List; import java.util.Map; -import org.teiid.translator.TranslatorException; import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradeObjectConnection.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradeObjectConnection.java index 8ce55342a7..07797141a6 100644 --- a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradeObjectConnection.java +++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradeObjectConnection.java @@ -5,8 +5,8 @@ import org.teiid.translator.object.CacheNameProxy; import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; import org.teiid.translator.object.simpleMap.SimpleMapCacheConnection; +import org.teiid.util.Version; public class TradeObjectConnection extends SimpleMapCacheConnection { diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradesCacheSource.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradesCacheSource.java index 3270d8d5bd..217e1971b0 100644 --- a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradesCacheSource.java +++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/trades/TradesCacheSource.java @@ -30,7 +30,7 @@ import org.teiid.translator.object.ClassRegistry; import org.teiid.translator.object.ObjectConnection; -import org.teiid.translator.object.Version; +import org.teiid.util.Version; /** diff --git a/connectors/translator-odata/src/test/java/org/teiid/translator/odata/TestODataQueryExecution.java b/connectors/translator-odata/src/test/java/org/teiid/translator/odata/TestODataQueryExecution.java index 8688e5455d..763922b53b 100644 --- a/connectors/translator-odata/src/test/java/org/teiid/translator/odata/TestODataQueryExecution.java +++ b/connectors/translator-odata/src/test/java/org/teiid/translator/odata/TestODataQueryExecution.java @@ -216,7 +216,6 @@ public void testArrayType() throws Exception { String ddl = DDLStringVisitor.getDDLString(mf.getSchema(), null, null); - System.out.println(ddl); TransformationMetadata metadata = RealMetadataFactory.fromDDL(ddl, "northwind", "nw"); String query = "SELECT * FROM G2"; diff --git a/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestTPCR.java b/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestTPCR.java index 18cfa8886b..e19cebd829 100644 --- a/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestTPCR.java +++ b/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestTPCR.java @@ -35,9 +35,9 @@ import org.teiid.query.processor.HardcodedDataManager; import org.teiid.query.processor.ProcessorPlan; import org.teiid.query.unittest.TimestampUtil; -import org.teiid.translator.jdbc.Version; import org.teiid.translator.jdbc.oracle.OracleExecutionFactory; import org.teiid.translator.jdbc.sqlserver.SQLServerExecutionFactory; +import org.teiid.util.Version;