From b90d806f4363ebfd28e6492170dd9f5e951ed39a Mon Sep 17 00:00:00 2001 From: berryware Date: Fri, 12 Dec 2025 13:36:48 -0500 Subject: [PATCH] remove the log throw anti-pattern. add a core package to cpo-core so it matches with jdbc and cassandra --- .../CassandraBoundStatementCpoData.java | 10 +- .../CassandraBoundStatementFactory.java | 14 +- .../cpo/cassandra/CassandraCpoAdapter.java | 44 ++-- .../cassandra/CassandraCpoAdapterFactory.java | 10 +- .../cpo/cassandra/ClusterDataSourceInfo.java | 4 +- .../config/CassandraCpoConfigProcessor.java | 10 +- .../cassandra/config/ConfigInstantiator.java | 6 +- .../CassandraMetaXmlObjectExporter.java | 10 +- .../cassandra/meta/CassandraCpoAttribute.java | 10 +- .../meta/CassandraCpoMetaAdapter.java | 14 +- .../meta/CassandraCpoMetaDescriptor.java | 6 +- .../meta/CassandraMethodMapEntry.java | 2 +- .../cassandra/meta/CassandraMethodMapper.java | 4 +- .../meta/CassandraResultSetCpoData.java | 8 +- .../transform/CassandraCpoTransform.java | 4 +- .../cassandra/transform/TransformNoOp.java | 2 +- .../synchronoss/cpo/cassandra/BlobTest.java | 4 +- .../cpo/cassandra/CassandraSuiteListener.java | 2 +- .../cpo/cassandra/CollectionsTest.java | 4 +- .../cpo/cassandra/ConstructorTest.java | 4 +- .../cpo/cassandra/DeleteObjectTest.java | 6 +- .../synchronoss/cpo/cassandra/EntityTest.java | 6 +- .../cpo/cassandra/ExistObjectTest.java | 12 +- .../cpo/cassandra/HotDeployTest.java | 8 +- .../cpo/cassandra/InheritanceTest.java | 4 +- .../cpo/cassandra/InsertObjectTest.java | 4 +- .../cpo/cassandra/InvalidParameterTest.java | 8 +- .../cpo/cassandra/NativeExpressionTest.java | 8 +- .../cpo/cassandra/OrderByTest.java | 6 +- .../cpo/cassandra/RetrieveBeanTest.java | 4 +- .../cpo/cassandra/UpdateObjectTest.java | 10 +- .../synchronoss/cpo/cassandra/WhereTest.java | 10 +- .../cpo/cassandra/XmlValidationTest.java | 2 +- .../main/java/org/synchronoss/cpo/GUID.java | 116 ---------- .../cpo/{ => core}/AbstractCpoData.java | 4 +- .../{ => core}/AbstractDataSourceInfo.java | 4 +- .../cpo/{ => core}/BindAttribute.java | 4 +- .../cpo/{ => core}/BindableCpoOrderBy.java | 12 +- .../cpo/{ => core}/BindableCpoWhere.java | 16 +- .../cpo/{ => core}/BindableWhereBuilder.java | 18 +- .../cpo/{ => core}/ChildNodeException.java | 2 +- .../cpo/{ => core}/CpoAdapter.java | 10 +- .../cpo/{ => core}/CpoAdapterFactory.java | 4 +- .../{ => core}/CpoAdapterFactoryManager.java | 33 ++- .../cpo/{ => core}/CpoBaseAdapter.java | 10 +- .../synchronoss/cpo/{ => core}/CpoData.java | 2 +- .../cpo/{ => core}/CpoException.java | 2 +- .../cpo/{ => core}/CpoNativeFunction.java | 2 +- .../cpo/{ => core}/CpoOrderBy.java | 4 +- .../cpo/{ => core}/CpoReleasable.java | 2 +- .../cpo/{ => core}/CpoStatementFactory.java | 68 +++--- .../cpo/{ => core}/CpoTrxAdapter.java | 2 +- .../synchronoss/cpo/{ => core}/CpoWhere.java | 6 +- .../cpo/{ => core}/DataSourceInfo.java | 2 +- .../cpo/{ => core}/MetaDFVisitable.java | 2 +- .../cpo/{ => core}/MetaVisitor.java | 12 +- .../org/synchronoss/cpo/{ => core}/Node.java | 4 +- .../cpo/{ => core}/NodeVisitor.java | 14 +- .../cpo/{ => core}/cache/CpoAdapterCache.java | 4 +- .../cache/CpoAdapterFactoryCache.java | 4 +- .../cache/CpoMetaDescriptorCache.java | 4 +- .../{ => core}/config/CpoConfigProcessor.java | 6 +- .../cpo/{ => core}/enums/Comparison.java | 2 +- .../cpo/{ => core}/enums/Crud.java | 2 +- .../cpo/{ => core}/enums/Logical.java | 2 +- .../exporter/AbstractMetaVisitor.java | 12 +- .../exporter/CoreMetaXmlObjectExporter.java | 8 +- .../exporter/CpoClassSourceGenerator.java | 8 +- .../exporter/CpoInterfaceSourceGenerator.java | 8 +- .../CpoLegacyClassSourceGenerator.java | 6 +- .../exporter/MetaXmlObjectExporter.java | 4 +- .../exporter/XmlExporterServlet.java | 8 +- .../cpo/{ => core}/helper/CpoClassLoader.java | 2 +- .../{ => core}/helper/ExceptionHelper.java | 4 +- .../cpo/{ => core}/helper/XmlHelper.java | 2 +- .../cpo/{ => core}/jta/CpoBaseXaResource.java | 4 +- .../cpo/{ => core}/jta/CpoXaError.java | 2 +- .../cpo/{ => core}/jta/CpoXaResource.java | 2 +- .../cpo/{ => core}/jta/CpoXaState.java | 2 +- .../cpo/{ => core}/jta/CpoXaStateMap.java | 2 +- .../meta/AbstractBindableCpoData.java | 6 +- .../meta/AbstractCpoMetaAdapter.java | 8 +- .../cpo/{ => core}/meta/CpoMetaAdapter.java | 10 +- .../{ => core}/meta/CpoMetaDescriptor.java | 212 +++++++++--------- .../{ => core}/meta/CpoMetaExportable.java | 4 +- .../cpo/{ => core}/meta/DataTypeMapEntry.java | 2 +- .../cpo/{ => core}/meta/DataTypeMapper.java | 2 +- .../cpo/{ => core}/meta/MethodMapEntry.java | 2 +- .../cpo/{ => core}/meta/MethodMapper.java | 4 +- .../cpo/{ => core}/meta/ResultSetCpoData.java | 16 +- .../meta/bean/CpoAttributeBean.java | 2 +- .../{ => core}/meta/bean/CpoClassBean.java | 2 +- .../{ => core}/meta/bean/CpoFunctionBean.java | 2 +- .../meta/bean/CpoFunctionGroupBean.java | 2 +- .../{ => core}/meta/domain/CpoArgument.java | 4 +- .../{ => core}/meta/domain/CpoAttribute.java | 50 ++--- .../cpo/{ => core}/meta/domain/CpoClass.java | 18 +- .../meta/domain/CpoClassCaseInsensitive.java | 2 +- .../meta/domain/CpoClassCaseSensitive.java | 2 +- .../{ => core}/meta/domain/CpoFunction.java | 4 +- .../meta/domain/CpoFunctionGroup.java | 4 +- .../parser/BoundExpressionParser.java | 2 +- .../{ => core}/parser/ExpressionParser.java | 2 +- .../{ => core}/transform/CpoTransform.java | 4 +- .../transform/TransformStringByte.java | 4 +- .../cpo/jta/CpoXaResourceTest.java | 1 + .../cpo/jta/StringBuilderXaResource.java | 3 +- .../synchronoss/cpo/parser/ParserTest.java | 2 + .../cpo/transform/TransformTest.java | 4 +- .../java/org/synchronoss/cpo/xml/XmlTest.java | 6 +- cpo-core/src/test/resources/cpoConfig.xml | 190 ++++++++++++++++ cpo-core/src/test/resources/testCoreMeta.xml | 102 --------- cpo-core/src/test/resources/testMeta.xml | 91 ++++++++ .../cpo/jdbc/AbstractJdbcDataSourceInfo.java | 2 +- .../cpo/jdbc/AbstractStatementCpoData.java | 6 +- .../cpo/jdbc/CallableStatementCpoData.java | 20 +- .../cpo/jdbc/ClassJdbcDataSourceInfo.java | 10 +- .../cpo/jdbc/DriverJdbcDataSourceInfo.java | 4 +- .../jdbc/JdbcCallableStatementFactory.java | 21 +- .../synchronoss/cpo/jdbc/JdbcCpoAdapter.java | 38 ++-- .../cpo/jdbc/JdbcCpoAdapterFactory.java | 10 +- .../synchronoss/cpo/jdbc/JdbcCpoArgument.java | 2 +- .../cpo/jdbc/JdbcCpoAttribute.java | 6 +- .../cpo/jdbc/JdbcCpoTrxAdapter.java | 4 +- .../synchronoss/cpo/jdbc/JdbcCpoWhere.java | 8 +- .../jdbc/JdbcPreparedStatementCpoData.java | 16 +- .../jdbc/JdbcPreparedStatementFactory.java | 20 +- .../cpo/jdbc/JndiJdbcDataSourceInfo.java | 5 +- .../jdbc/config/JdbcCpoConfigProcessor.java | 10 +- .../exporter/JdbcMetaXmlObjectExporter.java | 10 +- .../cpo/jdbc/jta/JdbcCpoXaAdapter.java | 16 +- .../cpo/jdbc/meta/JdbcCpoMetaAdapter.java | 14 +- .../cpo/jdbc/meta/JdbcCpoMetaDescriptor.java | 6 +- .../cpo/jdbc/meta/JdbcMethodMapEntry.java | 2 +- .../cpo/jdbc/meta/JdbcMethodMapper.java | 4 +- .../cpo/jdbc/meta/JdbcResultSetCpoData.java | 8 +- .../transform}/JdbcCpoTransform.java | 6 +- .../transform}/TransformCharArray.java | 4 +- .../transform}/TransformClob.java | 4 +- .../transform}/TransformGZipBytes.java | 4 +- .../transform}/TransformNoOp.java | 4 +- .../transform}/TransformStringChar.java | 4 +- .../TransformTimestampToCalendar.java | 4 +- .../cpo/jdbc/JdbcSuiteListener.java | 2 +- .../cpo/jdbc/adapter/BigBatchTest.java | 8 +- .../cpo/jdbc/adapter/BigRetrieveTest.java | 8 +- .../cpo/jdbc/adapter/BlobTest.java | 4 +- .../cpo/jdbc/adapter/BlobTrxTest.java | 6 +- .../cpo/jdbc/adapter/CaseInsensitiveTest.java | 4 +- .../cpo/jdbc/adapter/CaseSensitiveTest.java | 4 +- .../cpo/jdbc/adapter/ConstructorTest.java | 4 +- .../cpo/jdbc/adapter/CriteriaObjectTest.java | 12 +- .../cpo/jdbc/adapter/DeleteObjectTest.java | 12 +- .../cpo/jdbc/adapter/EntityTest.java | 6 +- .../cpo/jdbc/adapter/ExecuteTest.java | 6 +- .../cpo/jdbc/adapter/ExecuteTrxTest.java | 6 +- .../cpo/jdbc/adapter/ExistObjectTest.java | 12 +- .../cpo/jdbc/adapter/HotDeployTest.java | 8 +- .../cpo/jdbc/adapter/InheritanceTest.java | 4 +- .../cpo/jdbc/adapter/InsertObjectTest.java | 4 +- .../jdbc/adapter/InterleavedWhereTest.java | 10 +- .../jdbc/adapter/InvalidParameterTest.java | 8 +- .../jdbc/adapter/NativeExpressionTest.java | 6 +- .../cpo/jdbc/adapter/OrderByTest.java | 6 +- .../cpo/jdbc/adapter/RetrieveBeanTest.java | 8 +- .../cpo/jdbc/adapter/RollbackTest.java | 4 +- .../cpo/jdbc/adapter/RollbackTrxTest.java | 8 +- .../cpo/jdbc/adapter/SelectForUpdateTest.java | 10 +- .../cpo/jdbc/adapter/UpdateObjectTest.java | 10 +- .../cpo/jdbc/adapter/WhereTest.java | 12 +- .../cpo/jdbc/adapter/XmlValidationTest.java | 2 +- .../cpo/jdbc/exporter/ExporterTest.java | 16 +- .../cpo/jdbc/jmeter/CpoJavaSamplerClient.java | 8 +- .../cpo/jdbc/jta/JdbcXaResourceTest.java | 10 +- .../parser/BoundExpressionParserTest.java | 2 +- .../src/test/resources/common/LobMetaData.xml | 4 +- .../resources/common/ValueCaseMetaData.xml | 2 +- .../test/resources/common/ValueMetaData.xml | 2 +- .../oracle/classdef/oracleLobMetaData.xml | 4 +- .../classdef/oracleValueCaseMetaData.xml | 2 +- .../oracle/classdef/oracleValueMetaData.xml | 2 +- .../cpo/plugin/GenerateJavaSources.java | 10 +- pom.xml | 54 +++-- 183 files changed, 1047 insertions(+), 1017 deletions(-) delete mode 100644 cpo-core/src/main/java/org/synchronoss/cpo/GUID.java rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/AbstractCpoData.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/AbstractDataSourceInfo.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/BindAttribute.java (93%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/BindableCpoOrderBy.java (92%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/BindableCpoWhere.java (95%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/BindableWhereBuilder.java (90%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/ChildNodeException.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoAdapter.java (99%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoAdapterFactory.java (92%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoAdapterFactoryManager.java (90%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoBaseAdapter.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoData.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoException.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoNativeFunction.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoOrderBy.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoReleasable.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoStatementFactory.java (81%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoTrxAdapter.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/CpoWhere.java (93%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/DataSourceInfo.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/MetaDFVisitable.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/MetaVisitor.java (81%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/Node.java (99%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/NodeVisitor.java (77%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/cache/CpoAdapterCache.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/cache/CpoAdapterFactoryCache.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/cache/CpoMetaDescriptorCache.java (95%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/config/CpoConfigProcessor.java (87%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/enums/Comparison.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/enums/Crud.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/enums/Logical.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/AbstractMetaVisitor.java (91%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/CoreMetaXmlObjectExporter.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/CpoClassSourceGenerator.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/CpoInterfaceSourceGenerator.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/CpoLegacyClassSourceGenerator.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/MetaXmlObjectExporter.java (92%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/exporter/XmlExporterServlet.java (93%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/helper/CpoClassLoader.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/helper/ExceptionHelper.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/helper/XmlHelper.java (99%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/jta/CpoBaseXaResource.java (99%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/jta/CpoXaError.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/jta/CpoXaResource.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/jta/CpoXaState.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/jta/CpoXaStateMap.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/AbstractBindableCpoData.java (88%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/AbstractCpoMetaAdapter.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/CpoMetaAdapter.java (88%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/CpoMetaDescriptor.java (67%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/CpoMetaExportable.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/DataTypeMapEntry.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/DataTypeMapper.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/MethodMapEntry.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/MethodMapper.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/ResultSetCpoData.java (78%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/bean/CpoAttributeBean.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/bean/CpoClassBean.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/bean/CpoFunctionBean.java (98%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/bean/CpoFunctionGroupBean.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoArgument.java (92%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoAttribute.java (87%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoClass.java (93%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoClassCaseInsensitive.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoClassCaseSensitive.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoFunction.java (96%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/meta/domain/CpoFunctionGroup.java (94%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/parser/BoundExpressionParser.java (99%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/parser/ExpressionParser.java (97%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/transform/CpoTransform.java (91%) rename cpo-core/src/main/java/org/synchronoss/cpo/{ => core}/transform/TransformStringByte.java (93%) create mode 100644 cpo-core/src/test/resources/cpoConfig.xml delete mode 100644 cpo-core/src/test/resources/testCoreMeta.xml create mode 100644 cpo-core/src/test/resources/testMeta.xml rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/JdbcCpoTransform.java (93%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformCharArray.java (96%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformClob.java (97%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformGZipBytes.java (97%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformNoOp.java (98%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformStringChar.java (96%) rename cpo-jdbc/src/main/java/org/synchronoss/cpo/{transform/jdbc => jdbc/transform}/TransformTimestampToCalendar.java (97%) diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementCpoData.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementCpoData.java index a6e72e5aa..ff08ceb24 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementCpoData.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementCpoData.java @@ -24,14 +24,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; import org.synchronoss.cpo.cassandra.meta.CassandraMethodMapEntry; import org.synchronoss.cpo.cassandra.meta.CassandraMethodMapper; import org.synchronoss.cpo.cassandra.transform.CassandraCpoTransform; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.AbstractBindableCpoData; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.transform.CpoTransform; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.AbstractBindableCpoData; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.transform.CpoTransform; /** * Helps manage data transfer between the CPO object and the Cassandra bound statement diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementFactory.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementFactory.java index 431e3288c..6f676f036 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementFactory.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraBoundStatementFactory.java @@ -28,13 +28,13 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.*; import org.synchronoss.cpo.cassandra.meta.CassandraMethodMapper; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.MethodMapper; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.*; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.MethodMapper; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; /** * CassandraBoundStatementFactory is the object that encapsulates the creation of the actual @@ -67,7 +67,7 @@ public class CassandraBoundStatementFactory extends CpoStatementFactory implemen * @param orderBy A collection of orderbys to sort the objects * @param nativeQueries Additional sql to be embedded into the CpoFunction sql that is used to * create the actual JDBC PreparedStatement - * @throws org.synchronoss.cpo.CpoException if a CPO error occurs + * @throws CpoException if a CPO error occurs */ public CassandraBoundStatementFactory( Session sess, diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapter.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapter.java index 4707fb420..4d8187ffb 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapter.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapter.java @@ -23,24 +23,25 @@ */ import com.datastax.driver.core.*; +import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.function.Consumer; import java.util.stream.Stream; import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.*; import org.synchronoss.cpo.cassandra.meta.CassandraCpoAttribute; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; import org.synchronoss.cpo.cassandra.meta.CassandraMethodMapper; import org.synchronoss.cpo.cassandra.meta.CassandraResultSetCpoData; -import org.synchronoss.cpo.enums.Crud; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.DataTypeMapEntry; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.*; +import org.synchronoss.cpo.core.enums.Crud; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.DataTypeMapEntry; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; /** * CassandraCpoAdapter is an interface for a set of routines that are responsible for managing value @@ -626,7 +627,7 @@ protected T processSelectGroup( localLogger.info(buildCpoClassLogLine(criteriaObj.getClass(), Crud.RETRIEVE, groupName)); try { - rObj = (T) bean.getClass().newInstance(); + rObj = (T) bean.getClass().getDeclaredConstructor().newInstance(); } catch (IllegalAccessException iae) { localLogger.error( "=================== Could not access default constructor for Class=<" @@ -821,16 +822,27 @@ public boolean tryAdvance(Consumer action) { Row row = rs.one(); T bean = null; try { - bean = (T) result.getClass().newInstance(); + bean = (T) result.getClass().getDeclaredConstructor().newInstance(); } catch (IllegalAccessException iae) { - localLogger.error( - "=================== Could not access default constructor for Class=<" + String msg = + "Could not access default constructor for Class=<" + result.getClass() - + "> =================="); - throw new CpoException( - "Unable to access the constructor of the Return bean", iae); + + ">"; + throw new CpoException(msg, iae); } catch (InstantiationException iae) { - throw new CpoException("Unable to instantiate Return bean", iae); + throw new CpoException( + "Unable to instantiate Return bean for Class=<" + result.getClass() + ">", + iae); + } catch (InvocationTargetException e) { + throw new CpoException( + "Unable to invoke constructor for Return bean Class=<" + + result.getClass() + + ">", + e); + } catch (NoSuchMethodException e) { + throw new CpoException( + "Constructor not found for Return bean Class=<" + result.getClass() + ">", + e); } for (int k = 0; k < columnCount; k++) { diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapterFactory.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapterFactory.java index fee1da64c..bc2ebd891 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapterFactory.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/CassandraCpoAdapterFactory.java @@ -22,11 +22,11 @@ * ]] */ -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; -import org.synchronoss.cpo.jta.CpoXaResource; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; +import org.synchronoss.cpo.core.jta.CpoXaResource; /** * A factory for creating CassandraCpoAdapter diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/ClusterDataSourceInfo.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/ClusterDataSourceInfo.java index 2b2aff1e9..6365f06d9 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/ClusterDataSourceInfo.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/ClusterDataSourceInfo.java @@ -28,8 +28,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.AbstractDataSourceInfo; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.AbstractDataSourceInfo; +import org.synchronoss.cpo.core.CpoException; /** * Contains the information needed to connect to a Cassandra cluster diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/CassandraCpoConfigProcessor.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/CassandraCpoConfigProcessor.java index 7da252c0b..9375deeb4 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/CassandraCpoConfigProcessor.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/CassandraCpoConfigProcessor.java @@ -27,15 +27,15 @@ import java.util.Collection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapterFactory; -import org.synchronoss.cpo.CpoException; import org.synchronoss.cpo.cassandra.CassandraCpoAdapter; import org.synchronoss.cpo.cassandra.CassandraCpoAdapterFactory; import org.synchronoss.cpo.cassandra.ClusterDataSourceInfo; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; -import org.synchronoss.cpo.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; import org.synchronoss.cpo.cpoconfig.*; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; /** * CassandraCpoConfigProcessor processes the datasource configuration file for cassandra. It pulls @@ -55,7 +55,7 @@ public CpoAdapterFactory processCpoConfig(CtDataSourceConfig cpoConfig) throws C CpoAdapterFactory cpoAdapterFactory = null; if (cpoConfig == null || !(cpoConfig instanceof CtCassandraConfig)) { - throw new CpoException("Invalid Jdbc Configuration Information"); + throw new CpoException("Invalid Cassandra Configuration Information"); } CtCassandraConfig cassandraConfig = (CtCassandraConfig) cpoConfig; diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/ConfigInstantiator.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/ConfigInstantiator.java index 81f2a3ae6..9dbf07c1f 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/ConfigInstantiator.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/config/ConfigInstantiator.java @@ -26,8 +26,8 @@ import java.lang.reflect.Method; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; /** * Instantiates the Config file processor @@ -53,7 +53,7 @@ public T instantiate(String className) throws CpoException { // Lets create the Factory try { Class factoryClass = Class.forName(className); - factoryMethodName = (FactoryMethodName) factoryClass.newInstance(); + factoryMethodName = (FactoryMethodName) factoryClass.getDeclaredConstructor().newInstance(); logger.debug("Created factory: " + className); Method factoryMethod = factoryClass.getMethod(factoryMethodName.getFactoryMethodName()); return (T) factoryMethod.invoke(factoryMethodName); diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/exporter/CassandraMetaXmlObjectExporter.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/exporter/CassandraMetaXmlObjectExporter.java index 238eff32b..5eb577968 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/exporter/CassandraMetaXmlObjectExporter.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/exporter/CassandraMetaXmlObjectExporter.java @@ -23,14 +23,14 @@ */ import org.synchronoss.cpo.cassandra.meta.CassandraCpoAttribute; +import org.synchronoss.cpo.core.exporter.CoreMetaXmlObjectExporter; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.synchronoss.cpo.cpometa.CtCassandraArgument; import org.synchronoss.cpo.cpometa.CtCassandraAttribute; import org.synchronoss.cpo.cpometa.ObjectFactory; -import org.synchronoss.cpo.exporter.CoreMetaXmlObjectExporter; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; /** * Exports the Cassandra metadata diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoAttribute.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoAttribute.java index 003a12b89..5930fb496 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoAttribute.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoAttribute.java @@ -25,11 +25,11 @@ import java.io.Serial; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * JdbcCpoAttribute. A class that includes the Jdbc specifc attributes that are additional to the diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaAdapter.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaAdapter.java index 62b5fb3b8..20aedb5c0 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaAdapter.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaAdapter.java @@ -33,15 +33,15 @@ import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.AbstractCpoMetaAdapter; +import org.synchronoss.cpo.core.meta.DataTypeMapEntry; +import org.synchronoss.cpo.core.meta.DataTypeMapper; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.parser.BoundExpressionParser; +import org.synchronoss.cpo.core.parser.ExpressionParser; import org.synchronoss.cpo.cpometa.CtAttribute; import org.synchronoss.cpo.cpometa.CtCassandraAttribute; -import org.synchronoss.cpo.meta.AbstractCpoMetaAdapter; -import org.synchronoss.cpo.meta.DataTypeMapEntry; -import org.synchronoss.cpo.meta.DataTypeMapper; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.parser.BoundExpressionParser; -import org.synchronoss.cpo.parser.ExpressionParser; /** * Created with IntelliJ IDEA. User: dberry Date: 9/10/13 Time: 08:14 AM To change this template use diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaDescriptor.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaDescriptor.java index 04a18f46e..4d59193a4 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaDescriptor.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraCpoMetaDescriptor.java @@ -22,10 +22,10 @@ * ]] */ -import org.synchronoss.cpo.CpoException; import org.synchronoss.cpo.cassandra.exporter.CassandraMetaXmlObjectExporter; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; /** * Created with IntelliJ IDEA. User: dberry Date: 9/10/13 Time: 07:56 AM To change this template use diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapEntry.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapEntry.java index 68f539368..357213ed4 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapEntry.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapEntry.java @@ -24,7 +24,7 @@ import java.io.Serial; import java.lang.reflect.Method; -import org.synchronoss.cpo.meta.MethodMapEntry; +import org.synchronoss.cpo.core.meta.MethodMapEntry; /** * MethodMapEntry is a class defines the getters and setters for JDBC specific data classes diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapper.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapper.java index e074993cd..4ebdf04ab 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapper.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraMethodMapper.java @@ -37,8 +37,8 @@ import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.meta.MethodMapper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.MethodMapper; /** * MethodMapper is a class defines the getters and setters for all the JDBC specific data classes diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraResultSetCpoData.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraResultSetCpoData.java index e44e93101..10e7cdd6e 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraResultSetCpoData.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/meta/CassandraResultSetCpoData.java @@ -23,10 +23,10 @@ */ import java.lang.reflect.InvocationTargetException; -import org.synchronoss.cpo.meta.MethodMapEntry; -import org.synchronoss.cpo.meta.MethodMapper; -import org.synchronoss.cpo.meta.ResultSetCpoData; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.MethodMapEntry; +import org.synchronoss.cpo.core.meta.MethodMapper; +import org.synchronoss.cpo.core.meta.ResultSetCpoData; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** Manages data transfer between the cpo objects and the result set */ public class CassandraResultSetCpoData extends ResultSetCpoData { diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/CassandraCpoTransform.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/CassandraCpoTransform.java index 8a5b6a6c0..f1907ae53 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/CassandraCpoTransform.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/CassandraCpoTransform.java @@ -22,9 +22,9 @@ * ]] */ -import org.synchronoss.cpo.CpoException; import org.synchronoss.cpo.cassandra.CassandraBoundStatementFactory; -import org.synchronoss.cpo.transform.CpoTransform; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.transform.CpoTransform; /** * Custom transforms of Java classes to Datasource classes diff --git a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/TransformNoOp.java b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/TransformNoOp.java index f7a59bf5a..d3ab7605a 100644 --- a/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/TransformNoOp.java +++ b/cpo-cassandra/src/main/java/org/synchronoss/cpo/cassandra/transform/TransformNoOp.java @@ -24,8 +24,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; import org.synchronoss.cpo.cassandra.CassandraBoundStatementFactory; +import org.synchronoss.cpo.core.CpoException; /** * This is an example of a transform that does nothing. It is used to test the mechanics of the diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/BlobTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/BlobTest.java index 7c4603673..45e812444 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/BlobTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/BlobTest.java @@ -27,9 +27,9 @@ import java.nio.ByteBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CassandraSuiteListener.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CassandraSuiteListener.java index 90d23c785..c3c465565 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CassandraSuiteListener.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CassandraSuiteListener.java @@ -27,7 +27,7 @@ import com.github.terma.javaniotcpproxy.TcpProxyConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.utility.DockerImageName; import org.testng.ISuite; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CollectionsTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CollectionsTest.java index 7914f5323..736589cce 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CollectionsTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/CollectionsTest.java @@ -25,9 +25,9 @@ import static org.testng.Assert.*; import java.util.*; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ConstructorTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ConstructorTest.java index c4148558e..fe2597730 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ConstructorTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ConstructorTest.java @@ -26,8 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.Test; /** diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/DeleteObjectTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/DeleteObjectTest.java index 0021ee462..0299c6f87 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/DeleteObjectTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/DeleteObjectTest.java @@ -30,10 +30,10 @@ import java.util.Date; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/EntityTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/EntityTest.java index c31bc43f2..8c9eef76e 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/EntityTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/EntityTest.java @@ -27,10 +27,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.testng.annotations.Test; /** diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ExistObjectTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ExistObjectTest.java index fba200ec8..640009837 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ExistObjectTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/ExistObjectTest.java @@ -27,12 +27,12 @@ import java.util.ArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/HotDeployTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/HotDeployTest.java index 3b60f5723..1eb617a0d 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/HotDeployTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/HotDeployTest.java @@ -30,10 +30,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InheritanceTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InheritanceTest.java index 872a164bb..3183a33f7 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InheritanceTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InheritanceTest.java @@ -26,9 +26,9 @@ import java.util.ArrayList; import java.util.Date; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InsertObjectTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InsertObjectTest.java index c082f35bd..708a5c218 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InsertObjectTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InsertObjectTest.java @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InvalidParameterTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InvalidParameterTest.java index 40b664f86..b984a787b 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InvalidParameterTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/InvalidParameterTest.java @@ -29,10 +29,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/NativeExpressionTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/NativeExpressionTest.java index 65d54a322..9c764b646 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/NativeExpressionTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/NativeExpressionTest.java @@ -27,10 +27,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoNativeFunction; -import org.synchronoss.cpo.CpoWhere; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoNativeFunction; +import org.synchronoss.cpo.core.CpoWhere; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/OrderByTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/OrderByTest.java index c9e39c906..30785d149 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/OrderByTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/OrderByTest.java @@ -26,9 +26,9 @@ import java.util.ArrayList; import java.util.Collection; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoOrderBy; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoOrderBy; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/RetrieveBeanTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/RetrieveBeanTest.java index a2b6df5de..67ed57d44 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/RetrieveBeanTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/RetrieveBeanTest.java @@ -30,8 +30,8 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/UpdateObjectTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/UpdateObjectTest.java index 059225eb9..f252bf066 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/UpdateObjectTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/UpdateObjectTest.java @@ -28,12 +28,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; import org.synchronoss.cpo.cassandra.meta.CassandraCpoMetaDescriptor; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/WhereTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/WhereTest.java index 843638dd2..1bb18bff7 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/WhereTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/WhereTest.java @@ -27,11 +27,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/XmlValidationTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/XmlValidationTest.java index 2b63e4e5e..d4b5d1712 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/XmlValidationTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/XmlValidationTest.java @@ -24,8 +24,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.synchronoss.cpo.core.helper.XmlHelper; import org.synchronoss.cpo.cpoconfig.CtCpoConfig; -import org.synchronoss.cpo.helper.XmlHelper; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/GUID.java b/cpo-core/src/main/java/org/synchronoss/cpo/GUID.java deleted file mode 100644 index 99030930a..000000000 --- a/cpo-core/src/main/java/org/synchronoss/cpo/GUID.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.synchronoss.cpo; - -/*- - * [[ - * core - * == - * Copyright (C) 2003 - 2025 David E. Berry - * == - * This program 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 3 of the - * License, or (at your option) any later version. - * - * This program 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 General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ]] - */ - -import java.math.BigInteger; -import java.net.InetAddress; -import java.security.SecureRandom; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class GUID { - - private static GUID guid_ = new GUID(); - private SecureRandom seeder; - SecureRandom sr; - String guidMidValue; - private static final Logger logger = LoggerFactory.getLogger(GUID.class); - - private GUID() { - initGuid(); - } - - private void initGuid() { - try { - seeder = SecureRandom.getInstance("SHA1PRNG"); - seeder.generateSeed(20); - sr = SecureRandom.getInstance("SHA1PRNG"); - byte[] newSeed = new byte[20]; - seeder.nextBytes(newSeed); - sr.setSeed(newSeed); - - StringBuilder tmpBuffer = new StringBuilder(); - // get the inet address - InetAddress inet = InetAddress.getLocalHost(); - byte[] bytes = inet.getAddress(); - String hexInetAddress = hexFormat(new BigInteger(bytes).intValue()); - - // get the hashcode - String thisHashCode = hexFormat(this.hashCode()); - - /* - * set up a cached midValue as this is the same per method / call as is object specific and is the / - * ...-xxxx-xxxx-xxxx-xxxx.. mid part of the sequence - */ - tmpBuffer.append("-"); - tmpBuffer.append(hexInetAddress.substring(0, 4)); - tmpBuffer.append("-"); - tmpBuffer.append(hexInetAddress.substring(4)); - tmpBuffer.append("-"); - tmpBuffer.append(thisHashCode.substring(0, 4)); - tmpBuffer.append("-"); - tmpBuffer.append(thisHashCode.substring(4)); - guidMidValue = tmpBuffer.toString(); - } catch (Exception e) { - logger.debug("initGuid: " + e.getMessage()); - } - } - - static GUID getInstance() { - return guid_; - } - - public static String getGUID() { - GUID guid = getInstance(); - long timeNow = System.currentTimeMillis(); - int timeLow = (int) timeNow & 0xFFFFFFFF; - int node = guid.sr.nextInt(); - String retVal = hexFormat(timeLow) + guid.guidMidValue + hexFormat(node); - logger.debug("getGUID(): " + retVal); - return retVal; - } - - /** - * Returns an 8 character hexidecimal representation of trgt. If the result is not equal to eight - * characters leading zeros are prefixed. - * - * @return 8 character hex representation of trgt - */ - private static String hexFormat(int trgt) { - String s = Integer.toHexString(trgt); - int sz = s.length(); - - if (sz == 8) { - return s; - } - int fill = 8 - sz; - StringBuilder buf = new StringBuilder(); - - for (int i = 0; i < fill; ++i) { - // add leading zeros - buf.append('0'); - } - buf.append(s); - return buf.toString(); - } -} diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/AbstractCpoData.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractCpoData.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/AbstractCpoData.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractCpoData.java index d6a861939..397b7860e 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/AbstractCpoData.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractCpoData.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/AbstractDataSourceInfo.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractDataSourceInfo.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/AbstractDataSourceInfo.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractDataSourceInfo.java index e3cd7631b..e27a9ad48 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/AbstractDataSourceInfo.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/AbstractDataSourceInfo.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -67,8 +67,6 @@ public T getDataSource() throws CpoException { if (dataSource == null) { dataSource = createDataSource(); } - } catch (Exception e) { - throw new CpoException("Error instantiating DataSource", e); } finally { lock.unlock(); } diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/BindAttribute.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindAttribute.java similarity index 93% rename from cpo-core/src/main/java/org/synchronoss/cpo/BindAttribute.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/BindAttribute.java index 42d48c17e..7d6820a70 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/BindAttribute.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindAttribute.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * @author david.berry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoOrderBy.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoOrderBy.java similarity index 92% rename from cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoOrderBy.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoOrderBy.java index a34597bee..cba74c564 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoOrderBy.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoOrderBy.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,8 +22,8 @@ * ]] */ -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * BindableCpoOrderBy is an interface for specifying the sort order in which objects are returned @@ -109,7 +109,7 @@ public String toString(CpoClass cpoClass) throws CpoException { int attrOffset; int fromIndex = 0; - if (attribute != null && attribute.length() > 0) { + if (attribute != null && !attribute.isEmpty()) { CpoAttribute jdbcAttribute = cpoClass.getAttributeJava(attribute); if (jdbcAttribute == null) { throw new CpoException(attribute); @@ -117,8 +117,8 @@ public String toString(CpoClass cpoClass) throws CpoException { sb.append(" "); column = jdbcAttribute.getDataName(); - if (column != null && column.length() > 0) { - if (function != null && function.length() > 0) { + if (column != null && !column.isEmpty()) { + if (function != null && !function.isEmpty()) { while ((attrOffset = function.indexOf(attribute, fromIndex)) != -1) { sb.append(function.substring(0, attrOffset)); sb.append(column); diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoWhere.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoWhere.java similarity index 95% rename from cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoWhere.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoWhere.java index fcd7707d2..ec2317136 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/BindableCpoWhere.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableCpoWhere.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -23,10 +23,10 @@ */ import java.util.Collection; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * BindableCpoWhere is an interface for specifying the sort order in which objects are returned from @@ -154,7 +154,7 @@ public void setNot(boolean b) { this.not = b; } - public String toString(CpoClass cpoClass) throws CpoException { + public String toString(CpoClass cpoClass) { StringBuilder sb = new StringBuilder(); CpoAttribute cpoAttribute = null; @@ -171,7 +171,7 @@ public String toString(CpoClass cpoClass) throws CpoException { } if (getAttribute() != null) { - if (sb.length() > 0) { + if (!sb.isEmpty()) { sb.append(" "); } String fullyQualifiedColumn; @@ -318,7 +318,7 @@ private String buildFunction(String function, String match, String value) { int attrOffset; int fromIndex = 0; - if (function != null && function.length() > 0) { + if (function != null && !function.isEmpty()) { while ((attrOffset = function.indexOf(match, fromIndex)) != -1) { sb.append(function.substring(0, attrOffset)); sb.append(value); diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/BindableWhereBuilder.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableWhereBuilder.java similarity index 90% rename from cpo-core/src/main/java/org/synchronoss/cpo/BindableWhereBuilder.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/BindableWhereBuilder.java index d9a10c968..017576839 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/BindableWhereBuilder.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/BindableWhereBuilder.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.Collection; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * BindableWhereBuilder is an interface for specifying the sort order in which objects are returned @@ -63,7 +63,7 @@ public BindableWhereBuilder(CpoClass cpoClass) { * @return a boolean (false) to end visit or (true) to continue visiting */ @Override - public boolean visitBegin(Node node) throws Exception { + public boolean visitBegin(Node node) { BindableCpoWhere jcw = (BindableCpoWhere) node; whereClause.append(jcw.toString(cpoClass)); if (jcw.hasParent() || jcw.getLogical() != Logical.NONE) { @@ -82,7 +82,7 @@ public boolean visitBegin(Node node) throws Exception { * @return a boolean (false) to end visit or (true) to continue visiting */ @Override - public boolean visitMiddle(Node node) throws Exception { + public boolean visitMiddle(Node node) { return true; } @@ -93,7 +93,7 @@ public boolean visitMiddle(Node node) throws Exception { * @return a boolean (false) to end visit or (true) to continue visiting */ @Override - public boolean visitEnd(Node node) throws Exception { + public boolean visitEnd(Node node) { BindableCpoWhere bcw = (BindableCpoWhere) node; if (bcw.hasParent() || bcw.getLogical() != Logical.NONE) { whereClause.append(")"); @@ -108,7 +108,7 @@ public boolean visitEnd(Node node) throws Exception { * @return a boolean (false) to end visit or (true) to continue visiting */ @Override - public boolean visit(Node node) throws Exception { + public boolean visit(Node node) { BindableCpoWhere bcw = (BindableCpoWhere) node; CpoAttribute attribute; whereClause.append(bcw.toString(cpoClass)); diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/ChildNodeException.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/ChildNodeException.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/ChildNodeException.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/ChildNodeException.java index 4e404c530..10548e9f6 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/ChildNodeException.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/ChildNodeException.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapter.java similarity index 99% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapter.java index beb800d9c..c5348aaa3 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -25,10 +25,10 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * CpoAdapter is an interface for a set of routines that are responsible for Creating, Retrieving, diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactory.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactory.java similarity index 92% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactory.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactory.java index f65a14232..54b68bca8 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactory.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactory.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.jta.CpoXaResource; +import org.synchronoss.cpo.core.jta.CpoXaResource; /** Created by dberry on 11/8/15. */ public interface CpoAdapterFactory { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactoryManager.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactoryManager.java similarity index 90% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactoryManager.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactoryManager.java index e19b5d0fc..53b48d128 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoAdapterFactoryManager.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoAdapterFactoryManager.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -26,16 +26,16 @@ import java.util.concurrent.locks.ReentrantLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.cache.CpoAdapterFactoryCache; -import org.synchronoss.cpo.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.cache.CpoAdapterFactoryCache; +import org.synchronoss.cpo.core.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.helper.XmlHelper; +import org.synchronoss.cpo.core.jta.CpoXaResource; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; import org.synchronoss.cpo.cpoconfig.CtCpoConfig; import org.synchronoss.cpo.cpoconfig.CtDataSourceConfig; import org.synchronoss.cpo.cpoconfig.CtMetaDescriptor; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.helper.XmlHelper; -import org.synchronoss.cpo.jta.CpoXaResource; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; /** * @author dberry @@ -171,38 +171,33 @@ public static CpoAdapterFactory makeCpoAdapterFactory(CtDataSourceConfig dataSou cpoAdapterFactory = configProcessor.processCpoConfig(dataSourceConfig); } catch (ClassNotFoundException cnfe) { String msg = "CpoConfigProcessor not found: " + dataSourceConfig.getCpoConfigProcessor(); - logger.error(msg); - throw new CpoException(msg); + throw new CpoException(msg, cnfe); } catch (IllegalAccessException iae) { String msg = "Could not access CpoConfigProcessor: " + dataSourceConfig.getCpoConfigProcessor(); - logger.error(msg); - throw new CpoException(msg); + throw new CpoException(msg, iae); } catch (InstantiationException ie) { String msg = "Could not instantiate CpoConfigProcessor: " + dataSourceConfig.getCpoConfigProcessor() + ": " + ExceptionHelper.getLocalizedMessage(ie); - logger.error(msg); - throw new CpoException(msg); + throw new CpoException(msg, ie); } catch (ClassCastException cce) { String msg = "Class is not instance of CpoConfigProcessor: " + dataSourceConfig.getCpoConfigProcessor(); - logger.error(msg); - throw new CpoException(msg); + throw new CpoException(msg, cce); } catch (NoSuchMethodException e) { String msg = "Could not find the constructor for CpoConfigProcessor: " + dataSourceConfig.getCpoConfigProcessor(); - logger.error(msg); - throw new CpoException(msg); + throw new CpoException(msg, e); } catch (InvocationTargetException e) { String msg = "Could not invoke the constructor for CpoConfigProcessor: " + dataSourceConfig.getCpoConfigProcessor(); - logger.error(msg); + throw new CpoException(msg, e); } return cpoAdapterFactory; diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoBaseAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoBaseAdapter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java index 1e9a7eb24..2917cf626 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoBaseAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -26,10 +26,10 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import org.synchronoss.cpo.cache.CpoAdapterCache; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Crud; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.cache.CpoAdapterCache; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Crud; +import org.synchronoss.cpo.core.enums.Logical; /** * The CpoBaseAdapter has common functionality needed by all Adapter implementations diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoData.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoData.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoData.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoData.java index d19babf97..1fc4aab24 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoData.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoData.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoException.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoException.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoException.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoException.java index 3d89e06ec..666840c76 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoException.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoException.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoNativeFunction.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoNativeFunction.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoNativeFunction.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoNativeFunction.java index 104625bb9..f84f95f90 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoNativeFunction.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoNativeFunction.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoOrderBy.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoOrderBy.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoOrderBy.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoOrderBy.java index 75de35cf6..7e3707f98 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoOrderBy.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoOrderBy.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * CpoOrderBy is an interface for specifying the sort order in which objects are returned from the diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoReleasable.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoReleasable.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoReleasable.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoReleasable.java index cf311f4b4..40330b056 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoReleasable.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoReleasable.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoStatementFactory.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoStatementFactory.java similarity index 81% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoStatementFactory.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoStatementFactory.java index dc6045a64..eafd3c1e5 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoStatementFactory.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoStatementFactory.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -26,14 +26,13 @@ import java.util.*; import java.util.Map.Entry; import org.slf4j.Logger; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.MethodMapEntry; -import org.synchronoss.cpo.meta.MethodMapper; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; -import org.synchronoss.cpo.parser.BoundExpressionParser; +import org.synchronoss.cpo.core.meta.MethodMapEntry; +import org.synchronoss.cpo.core.meta.MethodMapper; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.parser.BoundExpressionParser; /** * JdbcPreparedStatementFactory is the object that encapsulates the creation of the actual @@ -72,7 +71,7 @@ public Logger getLocalLogger() { * @param wheres DOCUMENT ME! * @param orderBy DOCUMENT ME! * @return DOCUMENT ME! - * @throws org.synchronoss.cpo.CpoException DOCUMENT ME! + * @throws CpoException DOCUMENT ME! */ protected String buildSql( CpoClass cpoClass, @@ -92,11 +91,7 @@ protected String buildSql( BindableCpoWhere jcw = (BindableCpoWhere) where; // do the where stuff here when ready - try { - jcw.acceptDFVisitor(jwb); - } catch (Exception e) { - throw new CpoException("Unable to build WHERE clause", e); - } + jcw.acceptDFVisitor(jwb); if (sqlText.indexOf(jcw.getName()) == -1) { sqlText.append(" "); @@ -111,24 +106,15 @@ protected String buildSql( // do the order by stuff now if (orderBy != null) { HashMap mapOrderBy = new HashMap<>(); - try { - for (CpoOrderBy ob : orderBy) { - StringBuilder sb = mapOrderBy.get(ob.getMarker()); - if (sb == null) { - sb = new StringBuilder(" ORDER BY "); - mapOrderBy.put(ob.getMarker(), sb); - } else { - sb.append(","); - } - sb.append(ob.toString(cpoClass)); + for (CpoOrderBy ob : orderBy) { + StringBuilder sb = mapOrderBy.get(ob.getMarker()); + if (sb == null) { + sb = new StringBuilder(" ORDER BY "); + mapOrderBy.put(ob.getMarker(), sb); + } else { + sb.append(","); } - } catch (CpoException ce) { - throw new CpoException( - "Error Processing OrderBy Attribute<" - + ExceptionHelper.getLocalizedMessage(ce) - + "> not Found. JDBC Expression=<" - + sqlText.toString() - + ">"); + sb.append(ob.toString(cpoClass)); } Set> entries = mapOrderBy.entrySet(); @@ -144,7 +130,7 @@ protected String buildSql( if (nativeQueries != null) { for (CpoNativeFunction cnq : nativeQueries) { if (cnq.getMarker() == null || sqlText.indexOf(cnq.getMarker()) == -1) { - if (cnq.getExpression() != null && cnq.getExpression().length() > 0) { + if (cnq.getExpression() != null && !cnq.getExpression().isEmpty()) { sqlText.append(" "); sqlText.append(cnq.getExpression()); } @@ -169,7 +155,7 @@ private StringBuilder replaceMarker(StringBuilder source, String marker, String int rLength = replaceText.length(); // OUT.debug("starting string <"+source.toString()+">"); - if (source != null && source.length() > 0) { + if (source != null && !source.isEmpty()) { while ((attrOffset = source.indexOf(marker, fromIndex)) != -1) { source.replace(attrOffset, attrOffset + mLength, replaceText); fromIndex = attrOffset + rLength; @@ -193,7 +179,7 @@ private StringBuilder replaceMarker( Collection jwbBindValues = jwb.getBindValues(); // OUT.debug("starting string <"+source.toString()+">"); - if (source != null && source.length() > 0) { + if (source != null && !source.isEmpty()) { while ((attrOffset = source.indexOf(marker, fromIndex)) != -1) { source.replace(attrOffset, attrOffset + mLength, replace); fromIndex = attrOffset + rLength; @@ -278,15 +264,11 @@ public void setBindValues(Collection bindValues) throws CpoExcept } jsm.getBsSetter().invoke(this.getBindableStatement(), index++, bindObject); } catch (IllegalAccessException iae) { - localLogger.error( - "Error Accessing Prepared Statement Setter: " - + ExceptionHelper.getLocalizedMessage(iae)); - throw new CpoException(iae); + String msg = "Error Accessing Prepared Statement Setter: "; + throw new CpoException(msg, iae); } catch (InvocationTargetException ite) { - localLogger.error( - "Error Invoking Prepared Statement Setter: " - + ExceptionHelper.getLocalizedMessage(ite)); - throw new CpoException(ite.getCause()); + String msg = "Error Invoking Prepared Statement Setter: "; + throw new CpoException(msg, ite); } } else { CpoData cpoData = getCpoData(cpoAttribute, index++); diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoTrxAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoTrxAdapter.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoTrxAdapter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoTrxAdapter.java index fbf9e6349..5be51cb1e 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoTrxAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoTrxAdapter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/CpoWhere.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoWhere.java similarity index 93% rename from cpo-core/src/main/java/org/synchronoss/cpo/CpoWhere.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/CpoWhere.java index e4a81a6e5..2d6c56bb6 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/CpoWhere.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoWhere.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,8 +22,8 @@ * ]] */ -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; /** * CpoWhere is an interface for specifying the where clause to filter objects that are returned from diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/DataSourceInfo.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/DataSourceInfo.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/DataSourceInfo.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/DataSourceInfo.java index 015d23f8a..07b3fdc16 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/DataSourceInfo.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/DataSourceInfo.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/MetaDFVisitable.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/MetaDFVisitable.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/MetaDFVisitable.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/MetaDFVisitable.java index f737c4424..768c10012 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/MetaDFVisitable.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/MetaDFVisitable.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/MetaVisitor.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/MetaVisitor.java similarity index 81% rename from cpo-core/src/main/java/org/synchronoss/cpo/MetaVisitor.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/MetaVisitor.java index 8465ca0c4..4e105ac4e 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/MetaVisitor.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/MetaVisitor.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -22,11 +22,11 @@ * ]] */ -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; -import org.synchronoss.cpo.meta.domain.CpoFunctionGroup; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.meta.domain.CpoFunctionGroup; /** * This defines a depth first meta visitor. diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/Node.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/Node.java similarity index 99% rename from cpo-core/src/main/java/org/synchronoss/cpo/Node.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/Node.java index 0f845a675..3aa8f2f0a 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/Node.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/Node.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -454,7 +454,7 @@ public void setFirstChild(Node node) throws ChildNodeException { * @see NodeVisitor * @return false to cancel the visitor */ - public boolean acceptDFVisitor(NodeVisitor nv) throws Exception { + public boolean acceptDFVisitor(NodeVisitor nv) { Node currNode; boolean continueVisit = true; diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/NodeVisitor.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/NodeVisitor.java similarity index 77% rename from cpo-core/src/main/java/org/synchronoss/cpo/NodeVisitor.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/NodeVisitor.java index 8d2cf680a..8683cbaf5 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/NodeVisitor.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/NodeVisitor.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo; +package org.synchronoss.cpo.core; /*- * [[ @@ -30,34 +30,30 @@ public interface NodeVisitor { * * @param node The node to be visited * @return a boolean (false) to end visit or (true) to continue visiting - * @throws Exception error visiting the node for the first time */ - boolean visitBegin(Node node) throws Exception; + boolean visitBegin(Node node); /** * This is called for composite nodes between visiting children * * @param node The node to be visited * @return a boolean (false) to end visit or (true) to continue visiting - * @throws Exception error visiting the node between children */ - boolean visitMiddle(Node node) throws Exception; + boolean visitMiddle(Node node); /** * This is called by composite nodes after visiting children * * @param node The node to be visited * @return a boolean (false) to end visit or (true) to continue visiting - * @throws Exception error visiting the node after all the children */ - boolean visitEnd(Node node) throws Exception; + boolean visitEnd(Node node); /** * This is called for component elements which have no children * * @param node The element to be visited * @return a boolean (false) to end visit or (true) to continue visiting - * @throws Exception error visiting the childless node */ - boolean visit(Node node) throws Exception; + boolean visit(Node node); } diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterCache.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterCache.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterCache.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterCache.java index f250b0838..b98eea3ed 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterCache.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterCache.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.cache; +package org.synchronoss.cpo.core.cache; /*- * [[ @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import org.synchronoss.cpo.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapter; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterFactoryCache.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterFactoryCache.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterFactoryCache.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterFactoryCache.java index 044853978..6b9b1bb4e 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoAdapterFactoryCache.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoAdapterFactoryCache.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.cache; +package org.synchronoss.cpo.core.cache; /*- * [[ @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import org.synchronoss.cpo.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoAdapterFactory; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoMetaDescriptorCache.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoMetaDescriptorCache.java similarity index 95% rename from cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoMetaDescriptorCache.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoMetaDescriptorCache.java index 50994434f..bc60b4b57 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/cache/CpoMetaDescriptorCache.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/cache/CpoMetaDescriptorCache.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.cache; +package org.synchronoss.cpo.core.cache; /*- * [[ @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/config/CpoConfigProcessor.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/config/CpoConfigProcessor.java similarity index 87% rename from cpo-core/src/main/java/org/synchronoss/cpo/config/CpoConfigProcessor.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/config/CpoConfigProcessor.java index 9da8ffc5a..c94102ffb 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/config/CpoConfigProcessor.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/config/CpoConfigProcessor.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.config; +package org.synchronoss.cpo.core.config; /*- * [[ @@ -22,8 +22,8 @@ * ]] */ -import org.synchronoss.cpo.CpoAdapterFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.cpoconfig.CtDataSourceConfig; /** diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Comparison.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Comparison.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/enums/Comparison.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Comparison.java index 3a796cfea..5e5fe2156 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Comparison.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Comparison.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.enums; +package org.synchronoss.cpo.core.enums; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Crud.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Crud.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/enums/Crud.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Crud.java index c0e81fd0c..91ba5baf3 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Crud.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Crud.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.enums; +package org.synchronoss.cpo.core.enums; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Logical.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Logical.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/enums/Logical.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Logical.java index 64ce2d41e..a1ad8fdce 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/enums/Logical.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/enums/Logical.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.enums; +package org.synchronoss.cpo.core.enums; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/AbstractMetaVisitor.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/AbstractMetaVisitor.java similarity index 91% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/AbstractMetaVisitor.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/AbstractMetaVisitor.java index 9d04faf6a..3422663db 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/AbstractMetaVisitor.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/AbstractMetaVisitor.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,11 +22,11 @@ * ]] */ -import org.synchronoss.cpo.MetaVisitor; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; -import org.synchronoss.cpo.meta.domain.CpoFunctionGroup; +import org.synchronoss.cpo.core.MetaVisitor; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.meta.domain.CpoFunctionGroup; public abstract class AbstractMetaVisitor implements MetaVisitor { protected static final String ATTR_PREFIX = "ATTR_"; diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CoreMetaXmlObjectExporter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CoreMetaXmlObjectExporter.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/CoreMetaXmlObjectExporter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CoreMetaXmlObjectExporter.java index b5919a873..0f56d4e85 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CoreMetaXmlObjectExporter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CoreMetaXmlObjectExporter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,10 +22,10 @@ * ]] */ -import org.synchronoss.cpo.MetaVisitor; +import org.synchronoss.cpo.core.MetaVisitor; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.*; import org.synchronoss.cpo.cpometa.*; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.*; /** * XmlObject exporter for meta objects diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoClassSourceGenerator.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoClassSourceGenerator.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoClassSourceGenerator.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoClassSourceGenerator.java index 7d5671ac2..ce37021e7 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoClassSourceGenerator.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoClassSourceGenerator.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,9 +22,9 @@ * ]] */ -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * The CpoClassSourceGenerator generates java source code to define the cpo classes. diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoInterfaceSourceGenerator.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoInterfaceSourceGenerator.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoInterfaceSourceGenerator.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoInterfaceSourceGenerator.java index 04e50a360..6d5b085e6 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoInterfaceSourceGenerator.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoInterfaceSourceGenerator.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,9 +22,9 @@ * ]] */ -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * The CpoInterfaceSourceGenerator generates java source code to define the cpo interfaces. diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoLegacyClassSourceGenerator.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoLegacyClassSourceGenerator.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoLegacyClassSourceGenerator.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoLegacyClassSourceGenerator.java index 1c6e872bd..1d0146c58 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/CpoLegacyClassSourceGenerator.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/CpoLegacyClassSourceGenerator.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,8 +22,8 @@ * ]] */ -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** * The CpoClassSourceGenerator generates java source code to define the cpo classes. diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/MetaXmlObjectExporter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/MetaXmlObjectExporter.java similarity index 92% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/MetaXmlObjectExporter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/MetaXmlObjectExporter.java index 3b1c26d95..84cedd339 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/MetaXmlObjectExporter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/MetaXmlObjectExporter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.MetaVisitor; +import org.synchronoss.cpo.core.MetaVisitor; import org.synchronoss.cpo.cpometa.CtCpoMetaData; /** diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/XmlExporterServlet.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/XmlExporterServlet.java similarity index 93% rename from cpo-core/src/main/java/org/synchronoss/cpo/exporter/XmlExporterServlet.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/XmlExporterServlet.java index dfeb1e250..a369d0372 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/exporter/XmlExporterServlet.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/exporter/XmlExporterServlet.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.exporter; +package org.synchronoss.cpo.core.exporter; /*- * [[ @@ -28,9 +28,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; /** * Servlet that will output the current state of a meta descriptor in the form of xml. This xml can diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/helper/CpoClassLoader.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/CpoClassLoader.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/helper/CpoClassLoader.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/helper/CpoClassLoader.java index 7587b58cc..af95aba0d 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/helper/CpoClassLoader.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/CpoClassLoader.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.helper; +package org.synchronoss.cpo.core.helper; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/helper/ExceptionHelper.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/ExceptionHelper.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/helper/ExceptionHelper.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/helper/ExceptionHelper.java index 34ad04402..d4518d53c 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/helper/ExceptionHelper.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/ExceptionHelper.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.helper; +package org.synchronoss.cpo.core.helper; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/helper/XmlHelper.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/XmlHelper.java similarity index 99% rename from cpo-core/src/main/java/org/synchronoss/cpo/helper/XmlHelper.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/helper/XmlHelper.java index 29dea4266..5fcdae484 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/helper/XmlHelper.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/helper/XmlHelper.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.helper; +package org.synchronoss.cpo.core.helper; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoBaseXaResource.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoBaseXaResource.java similarity index 99% rename from cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoBaseXaResource.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoBaseXaResource.java index 3bccdb2a3..e0ccb8625 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoBaseXaResource.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoBaseXaResource.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.jta; +package org.synchronoss.cpo.core.jta; /*- * [[ @@ -29,7 +29,7 @@ import java.util.function.Function; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** Created by dberry on 3/9/15. */ public abstract class CpoBaseXaResource implements CpoXaResource { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaError.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaError.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaError.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaError.java index d1cf90a34..5db420c15 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaError.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaError.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.jta; +package org.synchronoss.cpo.core.jta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaResource.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaResource.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaResource.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaResource.java index 7125d05db..1dba3a959 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaResource.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaResource.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.jta; +package org.synchronoss.cpo.core.jta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaState.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaState.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaState.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaState.java index 6d9a60d7d..d621fb7f4 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaState.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaState.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.jta; +package org.synchronoss.cpo.core.jta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaStateMap.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaStateMap.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaStateMap.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaStateMap.java index c9973e4bb..93f1123b8 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/jta/CpoXaStateMap.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/jta/CpoXaStateMap.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.jta; +package org.synchronoss.cpo.core.jta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractBindableCpoData.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractBindableCpoData.java similarity index 88% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractBindableCpoData.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractBindableCpoData.java index 7a77571be..6cf384101 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractBindableCpoData.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractBindableCpoData.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -22,8 +22,8 @@ * ]] */ -import org.synchronoss.cpo.AbstractCpoData; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.AbstractCpoData; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractCpoMetaAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractCpoMetaAdapter.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractCpoMetaAdapter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractCpoMetaAdapter.java index 530e0731d..40d7cf4a3 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/AbstractCpoMetaAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/AbstractCpoMetaAdapter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -25,10 +25,10 @@ import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.enums.Crud; +import org.synchronoss.cpo.core.meta.domain.*; import org.synchronoss.cpo.cpometa.*; -import org.synchronoss.cpo.enums.Crud; -import org.synchronoss.cpo.meta.domain.*; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaAdapter.java similarity index 88% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaAdapter.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaAdapter.java index b96947df6..39046031a 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaAdapter.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -23,10 +23,10 @@ */ import java.util.List; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.parser.ExpressionParser; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.parser.ExpressionParser; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaDescriptor.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaDescriptor.java similarity index 67% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaDescriptor.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaDescriptor.java index af888e982..a91fb5faf 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaDescriptor.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaDescriptor.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -37,17 +37,17 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.cache.CpoMetaDescriptorCache; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.cache.CpoMetaDescriptorCache; +import org.synchronoss.cpo.core.exporter.CoreMetaXmlObjectExporter; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.helper.XmlHelper; +import org.synchronoss.cpo.core.meta.domain.*; +import org.synchronoss.cpo.core.parser.ExpressionParser; import org.synchronoss.cpo.cpometa.CtCpoMetaData; import org.synchronoss.cpo.cpometa.ObjectFactory; -import org.synchronoss.cpo.exporter.CoreMetaXmlObjectExporter; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.helper.XmlHelper; -import org.synchronoss.cpo.meta.domain.*; -import org.synchronoss.cpo.parser.ExpressionParser; /** * @author dberry @@ -72,20 +72,31 @@ protected CpoMetaDescriptor(String name, boolean caseSensitive) throws CpoExcept try { Class metaAdapterClass = getMetaAdapterClass(); logger.debug("Creating MetaAdapter: " + metaAdapterClass.getName()); - metaAdapter = (AbstractCpoMetaAdapter) metaAdapterClass.newInstance(); + metaAdapter = + (AbstractCpoMetaAdapter) metaAdapterClass.getDeclaredConstructor().newInstance(); logger.debug("Created MetaAdapter: " + metaAdapterClass.getName()); } catch (InstantiationException ie) { - throw new CpoException( - "Could not instantiate CpoMetaAdapter: " + ExceptionHelper.getLocalizedMessage(ie)); + throw new CpoException("Could not instantiate CpoMetaAdapter: ", ie); } catch (IllegalAccessException iae) { - throw new CpoException( - "Could not access CpoMetaAdapter: " + ExceptionHelper.getLocalizedMessage(iae)); + throw new CpoException("Could not access CpoMetaAdapter: ", iae); } catch (ClassCastException cce) { throw new CpoException( "CpoMetaAdapter must extend AbstractCpoMetaAdapter: " + getMetaAdapterClass().getName() - + ":" - + ExceptionHelper.getLocalizedMessage(cce)); + + ":", + cce); + } catch (InvocationTargetException e) { + throw new CpoException( + "Could not invoke constructor for CpoMetaAdapter: " + + getMetaAdapterClass().getName() + + ":", + e); + } catch (NoSuchMethodException e) { + throw new CpoException( + "Could not find a default constructor for CpoMetaAdapter: " + + getMetaAdapterClass().getName() + + ":", + e); } } @@ -167,94 +178,87 @@ protected static CpoMetaDescriptor createUpdateInstance( String metaDescriptorClassName = null; var errBuilder = new StringBuilder(); - try { - logger.debug("CpoMetaDescriptor: " + metaDescriptor); - - for (String metaXml : metaXmls) { - logger.debug("Processing: " + metaXml); - errBuilder.setLength(0); - CtCpoMetaData ctCpoMetaData = - XmlHelper.unmarshalXmlObject( - XmlHelper.CPO_META_XSD, metaXml, CtCpoMetaData.class, errBuilder); - if (!errBuilder.isEmpty()) { - throw new RuntimeException("Error parsing CPO meta XML: " + errBuilder.toString()); - } + logger.debug("CpoMetaDescriptor: " + metaDescriptor); - try { - if (metaDescriptor == null) { - logger.debug("Getting descriptor name"); - metaDescriptorClassName = ctCpoMetaData.getMetaDescriptor(); - logger.debug("Getting the Class"); - Class clazz = CpoClassLoader.forName(metaDescriptorClassName); - logger.debug("Getting the Constructor"); - Constructor cons = clazz.getConstructor(String.class, boolean.class); - logger.debug("Creating the instance"); - metaDescriptor = (CpoMetaDescriptor) cons.newInstance(name, caseSensitive); - logger.debug("Adding the MetaDescriptor"); - addCpoMetaDescriptor(metaDescriptor); - } else if (!metaDescriptor - .getClass() - .getName() - .equals(ctCpoMetaData.getMetaDescriptor())) { - throw new CpoException( - "Error processing multiple metaXml files. All files must have the same" - + " CpoMetaDescriptor class name."); - } - - metaDescriptor.setDefaultPackageName(ctCpoMetaData.getDefaultPackageName()); - metaDescriptor.getCpoMetaAdapter().loadCpoMetaDataDocument(ctCpoMetaData, caseSensitive); - } catch (ClassNotFoundException cnfe) { - throw new CpoException( - "CpoMetaAdapter not found: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(cnfe)); - } catch (IllegalAccessException iae) { - throw new CpoException( - "Could not access CpoMetaAdapter: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(iae)); - } catch (InstantiationException ie) { - throw new CpoException( - "Could not instantiate CpoMetaAdapter: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(ie)); - } catch (InvocationTargetException ite) { - throw new CpoException( - "Could not invoke constructor: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(ite)); - } catch (IllegalArgumentException iae) { - throw new CpoException( - "Illegal Argument to constructor: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(iae)); - } catch (NoSuchMethodException nsme) { - throw new CpoException( - "Could not find constructor: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(nsme)); - } catch (SecurityException se) { - throw new CpoException( - "Not allowed to access constructor: " - + metaDescriptorClassName - + ": " - + ExceptionHelper.getLocalizedMessage(se)); - } catch (ClassCastException cce) { + for (String metaXml : metaXmls) { + logger.debug("Processing: " + metaXml); + errBuilder.setLength(0); + CtCpoMetaData ctCpoMetaData = + XmlHelper.unmarshalXmlObject( + XmlHelper.CPO_META_XSD, metaXml, CtCpoMetaData.class, errBuilder); + if (!errBuilder.isEmpty()) { + throw new RuntimeException("Error parsing CPO meta XML: " + errBuilder.toString()); + } + + try { + if (metaDescriptor == null) { + logger.debug("Getting descriptor name"); + metaDescriptorClassName = ctCpoMetaData.getMetaDescriptor(); + logger.debug("Getting the Class"); + Class clazz = CpoClassLoader.forName(metaDescriptorClassName); + logger.debug("Getting the Constructor"); + Constructor cons = clazz.getConstructor(String.class, boolean.class); + logger.debug("Creating the instance"); + metaDescriptor = (CpoMetaDescriptor) cons.newInstance(name, caseSensitive); + logger.debug("Adding the MetaDescriptor"); + addCpoMetaDescriptor(metaDescriptor); + } else if (!metaDescriptor.getClass().getName().equals(ctCpoMetaData.getMetaDescriptor())) { throw new CpoException( - "Class is not instance of CpoMetaDescriptor: " - + metaDescriptorClassName - + ":" - + ExceptionHelper.getLocalizedMessage(cce)); + "Error processing multiple metaXml files. All files must have the same" + + " CpoMetaDescriptor class name."); } + + metaDescriptor.setDefaultPackageName(ctCpoMetaData.getDefaultPackageName()); + metaDescriptor.getCpoMetaAdapter().loadCpoMetaDataDocument(ctCpoMetaData, caseSensitive); + } catch (ClassNotFoundException cnfe) { + throw new CpoException( + "CpoMetaAdapter not found: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(cnfe)); + } catch (IllegalAccessException iae) { + throw new CpoException( + "Could not access CpoMetaAdapter: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(iae)); + } catch (InstantiationException ie) { + throw new CpoException( + "Could not instantiate CpoMetaAdapter: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(ie)); + } catch (InvocationTargetException ite) { + throw new CpoException( + "Could not invoke constructor: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(ite)); + } catch (IllegalArgumentException iae) { + throw new CpoException( + "Illegal Argument to constructor: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(iae)); + } catch (NoSuchMethodException nsme) { + throw new CpoException( + "Could not find constructor: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(nsme)); + } catch (SecurityException se) { + throw new CpoException( + "Not allowed to access constructor: " + + metaDescriptorClassName + + ": " + + ExceptionHelper.getLocalizedMessage(se)); + } catch (ClassCastException cce) { + throw new CpoException( + "Class is not instance of CpoMetaDescriptor: " + + metaDescriptorClassName + + ":" + + ExceptionHelper.getLocalizedMessage(cce)); } - } catch (Exception e) { - throw new CpoException(e); } return metaDescriptor; @@ -393,7 +397,7 @@ public final void export(File file) throws CpoException { CtCpoMetaData ctCpoMetaData = buildCpoMetaData(); Marshaller marshaller = createMarshaller(); marshaller.marshal(getJaxbElement(ctCpoMetaData), file); - } catch (Exception ex) { + } catch (JAXBException ex) { throw new CpoException(ex); } } @@ -403,7 +407,7 @@ public final void export(Writer writer) throws CpoException { CtCpoMetaData ctCpoMetaData = buildCpoMetaData(); Marshaller marshaller = createMarshaller(); marshaller.marshal(getJaxbElement(ctCpoMetaData), writer); - } catch (Exception ex) { + } catch (JAXBException ex) { throw new CpoException(ex); } } @@ -413,7 +417,7 @@ public final void export(OutputStream outputStream) throws CpoException { CtCpoMetaData ctCpoMetaData = buildCpoMetaData(); Marshaller marshaller = createMarshaller(); marshaller.marshal(getJaxbElement(ctCpoMetaData), outputStream); - } catch (Exception ex) { + } catch (JAXBException ex) { throw new CpoException(ex); } } diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaExportable.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaExportable.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaExportable.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaExportable.java index eff10ab85..46f08cc3b 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/CpoMetaExportable.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/CpoMetaExportable.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -25,7 +25,7 @@ import java.io.File; import java.io.OutputStream; import java.io.Writer; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * @author dberry diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapEntry.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapEntry.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapEntry.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapEntry.java index 91eca1f63..9366d859d 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapEntry.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapEntry.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapper.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapper.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapper.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapper.java index 2f41b6368..d74e41b59 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/DataTypeMapper.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/DataTypeMapper.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapEntry.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapEntry.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapEntry.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapEntry.java index 98eab1e51..55610d9c4 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapEntry.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapEntry.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapper.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapper.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapper.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapper.java index c62230565..1404d6a61 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/MethodMapper.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/MethodMapper.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * MethodMapper is a class defines the getters and setters for all the JDBC specific data classes diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/ResultSetCpoData.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/ResultSetCpoData.java similarity index 78% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/ResultSetCpoData.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/ResultSetCpoData.java index fd5613093..970ad0f79 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/ResultSetCpoData.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/ResultSetCpoData.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta; +package org.synchronoss.cpo.core.meta; /*- * [[ @@ -23,18 +23,14 @@ */ import java.lang.reflect.InvocationTargetException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * @author dberry */ public abstract class ResultSetCpoData extends AbstractBindableCpoData { - private static final Logger logger = LoggerFactory.getLogger(ResultSetCpoData.class); private Object rs = null; MethodMapper methodMapper; @@ -72,11 +68,9 @@ public Object invokeGetter() throws CpoException { // Get the getter for the Callable Statement javaObject = transformIn(invokeGetterImpl(getCpoAttribute(), methodMapEntry)); } catch (IllegalAccessException iae) { - logger.debug("Error Invoking ResultSet Method: " + ExceptionHelper.getLocalizedMessage(iae)); - throw new CpoException(iae); + throw new CpoException("Error Invoking ResultSet Method: ", iae); } catch (InvocationTargetException ite) { - logger.debug("Error Invoking ResultSet Method: " + ExceptionHelper.getLocalizedMessage(ite)); - throw new CpoException(ite.getCause()); + throw new CpoException("Error Invoking ResultSet Method: ", ite); } return javaObject; diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoAttributeBean.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoAttributeBean.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoAttributeBean.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoAttributeBean.java index c4e624cf4..06ca6b5ee 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoAttributeBean.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoAttributeBean.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.bean; +package org.synchronoss.cpo.core.meta.bean; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoClassBean.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoClassBean.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoClassBean.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoClassBean.java index 0403e3ce7..befbeab3b 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoClassBean.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoClassBean.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.bean; +package org.synchronoss.cpo.core.meta.bean; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionBean.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionBean.java similarity index 98% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionBean.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionBean.java index 8233c01e5..ebbe138da 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionBean.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionBean.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.bean; +package org.synchronoss.cpo.core.meta.bean; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionGroupBean.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionGroupBean.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionGroupBean.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionGroupBean.java index 64d243c9f..66cbd7590 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/bean/CpoFunctionGroupBean.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/bean/CpoFunctionGroupBean.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.bean; +package org.synchronoss.cpo.core.meta.bean; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoArgument.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoArgument.java similarity index 92% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoArgument.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoArgument.java index dcd6d51cc..df89a4dcb 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoArgument.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoArgument.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.meta.bean.CpoClassBean; +import org.synchronoss.cpo.core.meta.bean.CpoClassBean; public class CpoArgument extends CpoClassBean { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoAttribute.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoAttribute.java similarity index 87% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoAttribute.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoAttribute.java index 896f90615..6beb5aaa3 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoAttribute.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoAttribute.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ @@ -29,13 +29,13 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoData; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.bean.CpoAttributeBean; -import org.synchronoss.cpo.transform.CpoTransform; +import org.synchronoss.cpo.core.CpoData; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.bean.CpoAttributeBean; +import org.synchronoss.cpo.core.transform.CpoTransform; public class CpoAttribute extends CpoAttributeBean { @@ -136,8 +136,8 @@ protected List findMethods(Class clazz, String methodName, int args, retMethods.add(m); } } - } catch (Exception e) { - throw new CpoException("findMethod() Failed - Method Not Found: " + methodName); + } catch (SecurityException e) { + throw new CpoException("findMethod() Failed: " + methodName); } return retMethods; } @@ -176,10 +176,10 @@ public Object invokeGetter(Object obj) throws CpoException { try { return getGetter().invoke(obj, (Object[]) null); } catch (IllegalAccessException | InvocationTargetException e) { - localLogger.debug("Error Invoking Getter Method: " + ExceptionHelper.getLocalizedMessage(e)); + String msg = "invokeGetter: Could not invoke getter for " + obj.getClass(); + localLogger.debug(msg); + throw new CpoException(msg, e); } - - throw new CpoException("invokeGetter: Could not find a Getter for " + obj.getClass()); } private void dumpMethod(Method m) { @@ -278,7 +278,7 @@ public void loadRunTimeInfo(CpoMetaDescriptor metaDescriptor, Class metaClass failedMessage.append(ce2.getMessage()); } } - if (failedMessage.length() > 0) { + if (!failedMessage.isEmpty()) { throw new CpoException(failedMessage.toString()); } } @@ -286,23 +286,24 @@ public void loadRunTimeInfo(CpoMetaDescriptor metaDescriptor, Class metaClass protected void initTransformClass(CpoMetaDescriptor metaDescriptor) throws CpoException { String className = getTransformClassName(); Class transformClass; - Logger localLogger = className == null ? logger : LoggerFactory.getLogger(className); - if (className != null && className.length() > 0) { + if (className != null && !className.isEmpty()) { try { transformClass = CpoClassLoader.forName(className); - } catch (Exception e) { - localLogger.error("Invalid Transform Class specified:<" + className + ">"); - throw new CpoException("Invalid Transform Class specified:<" + className + ">:"); + } catch (ClassNotFoundException e) { + String msg = "Invalid Transform Class specified:<" + className + ">"; + throw new CpoException(msg, e); } Object transformObject; try { - transformObject = transformClass.newInstance(); - } catch (Exception e) { - localLogger.debug( - "Error Setting Transform Class: " + ExceptionHelper.getLocalizedMessage(e)); - throw new CpoException(e); + transformObject = transformClass.getDeclaredConstructor().newInstance(); + } catch (InstantiationException + | IllegalAccessException + | InvocationTargetException + | NoSuchMethodException e) { + String msg = "Error Setting Transform Class: "; + throw new CpoException(msg, e); } if (transformObject instanceof CpoTransform) { @@ -316,7 +317,6 @@ protected void initTransformClass(CpoMetaDescriptor metaDescriptor) throws CpoEx transformOutMethod = methods.get(0); } } else { - localLogger.error("Invalid CpoTransform Class specified:<" + className + ">"); throw new CpoException("Invalid CpoTransform Class specified:<" + className + ">"); } } diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClass.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClass.java similarity index 93% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClass.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClass.java index a54e2528f..c5b9349a7 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClass.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClass.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ @@ -29,14 +29,14 @@ import java.util.concurrent.locks.ReentrantLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.MetaDFVisitable; -import org.synchronoss.cpo.MetaVisitor; -import org.synchronoss.cpo.enums.Crud; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.bean.CpoClassBean; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.MetaDFVisitable; +import org.synchronoss.cpo.core.MetaVisitor; +import org.synchronoss.cpo.core.enums.Crud; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.bean.CpoClassBean; public abstract class CpoClass extends CpoClassBean implements Comparable, MetaDFVisitable { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseInsensitive.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseInsensitive.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseInsensitive.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseInsensitive.java index c35c7b600..09d2efb63 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseInsensitive.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseInsensitive.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseSensitive.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseSensitive.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseSensitive.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseSensitive.java index 67db5f7f8..5d62d41c7 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoClassCaseSensitive.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoClassCaseSensitive.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunction.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunction.java similarity index 96% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunction.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunction.java index 7d547e283..c953ec70d 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunction.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunction.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ @@ -26,7 +26,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.meta.bean.CpoFunctionBean; +import org.synchronoss.cpo.core.meta.bean.CpoFunctionBean; public class CpoFunction extends CpoFunctionBean { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunctionGroup.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunctionGroup.java similarity index 94% rename from cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunctionGroup.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunctionGroup.java index 5810713de..45a9e54e5 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/meta/domain/CpoFunctionGroup.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/meta/domain/CpoFunctionGroup.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.meta.domain; +package org.synchronoss.cpo.core.meta.domain; /*- * [[ @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.synchronoss.cpo.meta.bean.CpoFunctionGroupBean; +import org.synchronoss.cpo.core.meta.bean.CpoFunctionGroupBean; public class CpoFunctionGroup extends CpoFunctionGroupBean implements Comparable { diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/parser/BoundExpressionParser.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/parser/BoundExpressionParser.java similarity index 99% rename from cpo-core/src/main/java/org/synchronoss/cpo/parser/BoundExpressionParser.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/parser/BoundExpressionParser.java index 1cc0cb1e0..00edf99e5 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/parser/BoundExpressionParser.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/parser/BoundExpressionParser.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.parser; +package org.synchronoss.cpo.core.parser; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/parser/ExpressionParser.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/parser/ExpressionParser.java similarity index 97% rename from cpo-core/src/main/java/org/synchronoss/cpo/parser/ExpressionParser.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/parser/ExpressionParser.java index 2f71383e2..f83b4af14 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/parser/ExpressionParser.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/parser/ExpressionParser.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.parser; +package org.synchronoss.cpo.core.parser; /*- * [[ diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/transform/CpoTransform.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/transform/CpoTransform.java similarity index 91% rename from cpo-core/src/main/java/org/synchronoss/cpo/transform/CpoTransform.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/transform/CpoTransform.java index 51f6f7511..2875ca25d 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/transform/CpoTransform.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/transform/CpoTransform.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform; +package org.synchronoss.cpo.core.transform; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * @author Michael Bellomo diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/transform/TransformStringByte.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/transform/TransformStringByte.java similarity index 93% rename from cpo-core/src/main/java/org/synchronoss/cpo/transform/TransformStringByte.java rename to cpo-core/src/main/java/org/synchronoss/cpo/core/transform/TransformStringByte.java index 963d60119..e2025c632 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/transform/TransformStringByte.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/transform/TransformStringByte.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform; +package org.synchronoss.cpo.core.transform; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * Converts a String to a byte[] diff --git a/cpo-core/src/test/java/org/synchronoss/cpo/jta/CpoXaResourceTest.java b/cpo-core/src/test/java/org/synchronoss/cpo/jta/CpoXaResourceTest.java index 47216e3a0..9178c826a 100644 --- a/cpo-core/src/test/java/org/synchronoss/cpo/jta/CpoXaResourceTest.java +++ b/cpo-core/src/test/java/org/synchronoss/cpo/jta/CpoXaResourceTest.java @@ -27,6 +27,7 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import org.synchronoss.cpo.core.jta.CpoXaError; import org.testng.annotations.Test; /** Created by dberry on 8/9/15. */ diff --git a/cpo-core/src/test/java/org/synchronoss/cpo/jta/StringBuilderXaResource.java b/cpo-core/src/test/java/org/synchronoss/cpo/jta/StringBuilderXaResource.java index b3c4df746..3d97320dd 100644 --- a/cpo-core/src/test/java/org/synchronoss/cpo/jta/StringBuilderXaResource.java +++ b/cpo-core/src/test/java/org/synchronoss/cpo/jta/StringBuilderXaResource.java @@ -26,7 +26,8 @@ import javax.transaction.xa.XAResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.jta.CpoBaseXaResource; /** Created by dberry on 8/9/15. */ public class StringBuilderXaResource extends CpoBaseXaResource { diff --git a/cpo-core/src/test/java/org/synchronoss/cpo/parser/ParserTest.java b/cpo-core/src/test/java/org/synchronoss/cpo/parser/ParserTest.java index c70a7ac6e..419edc488 100644 --- a/cpo-core/src/test/java/org/synchronoss/cpo/parser/ParserTest.java +++ b/cpo-core/src/test/java/org/synchronoss/cpo/parser/ParserTest.java @@ -27,6 +27,8 @@ import java.text.ParseException; import java.util.Arrays; import java.util.List; +import org.synchronoss.cpo.core.parser.BoundExpressionParser; +import org.synchronoss.cpo.core.parser.ExpressionParser; import org.testng.annotations.Test; public class ParserTest { diff --git a/cpo-core/src/test/java/org/synchronoss/cpo/transform/TransformTest.java b/cpo-core/src/test/java/org/synchronoss/cpo/transform/TransformTest.java index 3f5cd8237..6ee5b9537 100644 --- a/cpo-core/src/test/java/org/synchronoss/cpo/transform/TransformTest.java +++ b/cpo-core/src/test/java/org/synchronoss/cpo/transform/TransformTest.java @@ -25,7 +25,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.transform.CpoTransform; +import org.synchronoss.cpo.core.transform.TransformStringByte; import org.testng.annotations.Test; public class TransformTest { diff --git a/cpo-core/src/test/java/org/synchronoss/cpo/xml/XmlTest.java b/cpo-core/src/test/java/org/synchronoss/cpo/xml/XmlTest.java index 0c24e3b8d..f613b4ad2 100644 --- a/cpo-core/src/test/java/org/synchronoss/cpo/xml/XmlTest.java +++ b/cpo-core/src/test/java/org/synchronoss/cpo/xml/XmlTest.java @@ -22,9 +22,9 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.XmlHelper; import org.synchronoss.cpo.cpometa.CtCpoMetaData; -import org.synchronoss.cpo.helper.XmlHelper; import org.testng.Assert; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class XmlTest { @Test public void testCpoMetaDataXml() throws CpoException { var errBuilder = new StringBuilder(); - var metaXml = "testCoreMeta.xml"; + var metaXml = "testMeta.xml"; CtCpoMetaData ctCpoMeta = XmlHelper.unmarshalXmlObject( diff --git a/cpo-core/src/test/resources/cpoConfig.xml b/cpo-core/src/test/resources/cpoConfig.xml new file mode 100644 index 000000000..3b16d4526 --- /dev/null +++ b/cpo-core/src/test/resources/cpoConfig.xml @@ -0,0 +1,190 @@ + + + + + + + /testMeta.xml + + + + /emptyClassMetaData.xml + /common/ValueMetaData.xml + /common/LobMetaData.xml + /emptyMetaData.xml + + + + + testMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + + caseSensitive + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + + caseInsensitive + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.driver} + ${h2.url} + ${h2.user} + ${h2.pswd} + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.driver} + ${h2.userurl} + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.driver} + ${h2.url} + + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.driver} + ${h2.url} + ${h2.user} + ${h2.pswd} + + + ${h2.driver} + ${h2.url} + ${h2.user} + ${h2.pswd} + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + ${h2.class} + ${h2.url} + + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.driver} + ${h2.url} + ${h2.user} + ${h2.pswd} + + + ${h2.class} + ${h2.url} + + + + + jdbcMeta + org.synchronoss.cpo.jdbc.config.JdbcCpoConfigProcessor + + ${h2.class} + ${h2.url} + + + + + ${h2.driver} + ${h2.url} + ${h2.user} + ${h2.pswd} + + + diff --git a/cpo-core/src/test/resources/testCoreMeta.xml b/cpo-core/src/test/resources/testCoreMeta.xml deleted file mode 100644 index 641aca8f5..000000000 --- a/cpo-core/src/test/resources/testCoreMeta.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - bLob - byte[] - B_LOB - LONGVARBINARY - org.synchronoss.cpo.transform.jdbc.TransformGZipBytes - - - bLob2 - byte[] - B_LOB2 - LONGVARBINARY - - - lobId - int - LOB_ID - INTEGER - - - cLob - char[] - C_LOB - LONGVARCHAR - org.synchronoss.cpo.transform.jdbc.TransformStringChar - - - - delete from lob_test where lob_id = ? - - lobId - - - - - - insert into lob_test (lob_id, b_lob, c_lob, b_lob2) values (?,?,?,?) - - lobId - - - bLob - - - cLob - - - bLob2 - - - - - - update lob_test set b_lob=?, c_lob=?, b_lob2=? where lob_id = ? - - bLob - - - cLob - - - bLob2 - - - lobId - - - - - - select * from lob_test where lob_id = ? - - lobId - - - - - diff --git a/cpo-core/src/test/resources/testMeta.xml b/cpo-core/src/test/resources/testMeta.xml new file mode 100644 index 000000000..94760aebc --- /dev/null +++ b/cpo-core/src/test/resources/testMeta.xml @@ -0,0 +1,91 @@ + + + + + + idJava + java.lang.String + idData + stringData + + + nameJava + java.lang.String + nameData + stringData + + + ageJave + int + ageData + intData + + + + delete from test_object where id = ? + + id + + + + + + insert into test_object (id, name, age) values (?,?,?) + + id + + + name + + + age + + + + + + update test_object set id=?, name=?, age=? where id = ? + + id + + + name + + + age + + + id + + + + + + select * from test_object where id = ? + + id + + + + + diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractJdbcDataSourceInfo.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractJdbcDataSourceInfo.java index 9eeb42bc6..cc5c015f7 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractJdbcDataSourceInfo.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractJdbcDataSourceInfo.java @@ -25,7 +25,7 @@ import java.util.Properties; import java.util.SortedMap; import java.util.TreeMap; -import org.synchronoss.cpo.AbstractDataSourceInfo; +import org.synchronoss.cpo.core.AbstractDataSourceInfo; /** * A class used for collecting the properties to instantiate the datasource diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractStatementCpoData.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractStatementCpoData.java index 06e01a281..5ea6931cf 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractStatementCpoData.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/AbstractStatementCpoData.java @@ -22,11 +22,11 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.AbstractBindableCpoData; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapEntry; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapper; -import org.synchronoss.cpo.meta.AbstractBindableCpoData; -import org.synchronoss.cpo.meta.domain.CpoAttribute; public abstract class AbstractStatementCpoData extends AbstractBindableCpoData { diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/CallableStatementCpoData.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/CallableStatementCpoData.java index 563b2c7af..163cd8a5a 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/CallableStatementCpoData.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/CallableStatementCpoData.java @@ -26,13 +26,13 @@ import java.sql.CallableStatement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.transform.CpoTransform; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapEntry; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapper; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.transform.CpoTransform; -import org.synchronoss.cpo.transform.jdbc.JdbcCpoTransform; +import org.synchronoss.cpo.jdbc.transform.JdbcCpoTransform; /** * A class that builds constructs and executes callable statements @@ -117,14 +117,8 @@ public Object invokeGetter() throws CpoException { break; } javaObject = transformIn(javaObject); - } catch (IllegalAccessException iae) { - logger.debug( - "Error Invoking CallableStatement Method: " + ExceptionHelper.getLocalizedMessage(iae)); - throw new CpoException(iae); - } catch (InvocationTargetException ite) { - logger.debug( - "Error Invoking CallableStatement Method: " + ExceptionHelper.getLocalizedMessage(ite)); - throw new CpoException(ite.getCause()); + } catch (IllegalAccessException | InvocationTargetException ie) { + throw new CpoException("Error Invoking CallableStatement Method: ", ie); } return javaObject; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/ClassJdbcDataSourceInfo.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/ClassJdbcDataSourceInfo.java index 1fc268d57..0b584bef4 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/ClassJdbcDataSourceInfo.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/ClassJdbcDataSourceInfo.java @@ -32,9 +32,9 @@ import javax.sql.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.CpoClassLoader; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.CpoClassLoader; +import org.synchronoss.cpo.core.helper.ExceptionHelper; /** * Collects the info required to instantiate a DataSource from a JDBC Driver Provides the @@ -98,7 +98,7 @@ protected DataSource createDataSource() throws CpoException { DataSource dataSource = null; try { Class dsClass = CpoClassLoader.forName(className); - CommonDataSource ds = (CommonDataSource) dsClass.newInstance(); + CommonDataSource ds = (CommonDataSource) dsClass.getDeclaredConstructor().newInstance(); if (ds instanceof ConnectionPoolDataSource) { this.poolDataSource = (ConnectionPoolDataSource) ds; @@ -117,7 +117,7 @@ protected DataSource createDataSource() throws CpoException { + className + ":" + ExceptionHelper.getLocalizedMessage(ie)); - } catch (IllegalAccessException iae) { + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException iae) { throw new CpoException("Could Not Access Class: " + className, iae); } diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/DriverJdbcDataSourceInfo.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/DriverJdbcDataSourceInfo.java index c4bc32903..19fc33048 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/DriverJdbcDataSourceInfo.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/DriverJdbcDataSourceInfo.java @@ -27,8 +27,8 @@ import java.sql.SQLException; import java.util.Properties; import javax.sql.DataSource; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.CpoClassLoader; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.CpoClassLoader; /** * Collects the info required to instantiate a DataSource from a JDBC Driver Provides the diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCallableStatementFactory.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCallableStatementFactory.java index 8a54d2b60..759fbd11a 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCallableStatementFactory.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCallableStatementFactory.java @@ -24,17 +24,17 @@ import java.sql.CallableStatement; import java.sql.Connection; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoData; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoReleasable; -import org.synchronoss.cpo.helper.ExceptionHelper; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; +import org.synchronoss.cpo.core.CpoData; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoReleasable; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; /** * JdbcCallableStatementFactory is the object that encapsulates the creation of the actual @@ -119,11 +119,8 @@ public JdbcCallableStatementFactory( j++; } - } catch (Exception e) { - localLogger.error( - "Error Instantiating JdbcCallableStatementFactory" - + ExceptionHelper.getLocalizedMessage(e)); - throw new CpoException(e); + } catch (SQLException e) { + throw new CpoException("Error Instantiating JdbcCallableStatementFactory", e); } } diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java index 0d410bcbf..c38a69f9e 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java @@ -33,20 +33,20 @@ import javax.sql.DataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.*; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Crud; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.*; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Crud; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.DataTypeMapEntry; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapper; import org.synchronoss.cpo.jdbc.meta.JdbcResultSetCpoData; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.DataTypeMapEntry; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; /** * JdbcCpoAdapter is an interface for a set of routines that are responsible for managing value @@ -75,7 +75,7 @@ public class JdbcCpoAdapter extends CpoBaseAdapter { * * @param metaDescriptor This datasource that identifies the cpo metadata datasource * @param jdsiTrx The datasoruce that identifies the transaction database. - * @throws org.synchronoss.cpo.CpoException exception + * @throws CpoException exception */ protected JdbcCpoAdapter(JdbcCpoMetaDescriptor metaDescriptor, DataSourceInfo jdsiTrx) throws CpoException { @@ -94,7 +94,7 @@ protected JdbcCpoAdapter(JdbcCpoMetaDescriptor metaDescriptor, DataSourceInfo long existsBean(String groupName, T bean, Collection wheres c = getReadConnection(); objCount = existsBean(groupName, bean, c, wheres); - } catch (Exception e) { - throw new CpoException("existsBean(String, T) failed", e); } finally { closeLocalConnection(c); } @@ -290,7 +287,6 @@ protected long existsBean( } } catch (SQLException e) { String msg = "existsBean(groupName, bean, con) failed:"; - localLogger.error(msg, e); throw new CpoException(msg, e); } finally { resultSetClose(rs); @@ -554,7 +550,7 @@ protected T processExecuteGroup(String groupName, C criteria, T result, C + ">========================="); try { - returnBean = (T) result.getClass().newInstance(); + returnBean = (T) result.getClass().getDeclaredConstructor().newInstance(); } catch (IllegalAccessException iae) { throw new CpoException("Unable to access the constructor of the Return Bean", iae); } catch (InstantiationException iae) { @@ -703,7 +699,7 @@ protected T processSelectGroup( localLogger.info(buildCpoClassLogLine(criteriaObj.getClass(), Crud.RETRIEVE, groupName)); try { - rObj = (T) bean.getClass().newInstance(); + rObj = (T) bean.getClass().getDeclaredConstructor().newInstance(); } catch (IllegalAccessException iae) { localLogger.error( "=================== Could not access default constructor for Class=<" @@ -909,7 +905,7 @@ public boolean tryAdvance(Consumer action) { if (!finalRs.next()) return false; T bean = null; try { - bean = (T) result.getClass().newInstance(); + bean = (T) result.getClass().getDeclaredConstructor().newInstance(); } catch (IllegalAccessException iae) { localLogger.error( "=================== Could not access default constructor for Class=<" diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapterFactory.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapterFactory.java index 5f2d85326..7796f6b09 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapterFactory.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapterFactory.java @@ -22,12 +22,12 @@ * ]] */ -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; +import org.synchronoss.cpo.core.jta.CpoXaResource; import org.synchronoss.cpo.jdbc.jta.JdbcCpoXaAdapter; -import org.synchronoss.cpo.jta.CpoXaResource; /** Created by dberry on 11/8/15. */ public class JdbcCpoAdapterFactory implements CpoAdapterFactory { diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoArgument.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoArgument.java index b335e00e9..3a372acdb 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoArgument.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoArgument.java @@ -23,7 +23,7 @@ */ import java.io.Serial; -import org.synchronoss.cpo.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; /** * JdbcCpoArgument is a class that defines the arguments to a JDBC expression diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAttribute.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAttribute.java index ab51196a7..db09d3ad8 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAttribute.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAttribute.java @@ -23,9 +23,9 @@ */ import java.io.Serial; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * JdbcCpoAttribute. A class that includes the Jdbc specifc attributes that are additional to the diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoTrxAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoTrxAdapter.java index a89282b45..0211d4941 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoTrxAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoTrxAdapter.java @@ -27,8 +27,8 @@ import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; /** A transaction adapter that allows the user to control the commits and role backs */ public class JdbcCpoTrxAdapter extends JdbcCpoAdapter implements CpoTrxAdapter { diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoWhere.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoWhere.java index 47fd9e13e..3681b7449 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoWhere.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoWhere.java @@ -22,10 +22,10 @@ * ]] */ -import org.synchronoss.cpo.BindableCpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.BindableCpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** * Created with IntelliJ IDEA. User: dberry Date: 13/10/13 Time: 14:05 PM To change this template diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementCpoData.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementCpoData.java index 33f6ce552..da2a651a4 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementCpoData.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementCpoData.java @@ -22,14 +22,14 @@ * ]] */ +import java.lang.reflect.InvocationTargetException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.transform.CpoTransform; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapEntry; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.transform.CpoTransform; -import org.synchronoss.cpo.transform.jdbc.JdbcCpoTransform; +import org.synchronoss.cpo.jdbc.transform.JdbcCpoTransform; /** * The data handler for a prepared statement @@ -65,7 +65,7 @@ public void invokeSetter(Object instanceObject) throws CpoException { methodMapEntry .getBsSetter() .invoke(cpoStatementFactory.getPreparedStatement(), getIndex(), param); - } catch (Exception e) { + } catch (InvocationTargetException | IllegalAccessException e) { throw new CpoException( "Error Invoking Jdbc Method: " + getCpoAttribute().getDataName() @@ -73,8 +73,8 @@ public void invokeSetter(Object instanceObject) throws CpoException { + getCpoAttribute().getJavaName() + ":" + methodMapEntry.getBsSetter().getName() - + ":" - + ExceptionHelper.getLocalizedMessage(e)); + + ":", + e); } } diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementFactory.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementFactory.java index 7c0f15c3d..601b32002 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementFactory.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPreparedStatementFactory.java @@ -29,13 +29,12 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.*; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.*; +import org.synchronoss.cpo.core.meta.MethodMapper; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.domain.CpoClass; +import org.synchronoss.cpo.core.meta.domain.CpoFunction; import org.synchronoss.cpo.jdbc.meta.JdbcMethodMapper; -import org.synchronoss.cpo.meta.MethodMapper; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoClass; -import org.synchronoss.cpo.meta.domain.CpoFunction; /** * JdbcPreparedStatementFactory is the object that encapsulates the creation of the actual @@ -97,13 +96,8 @@ public JdbcPreparedStatementFactory( ps_.setFetchSize(jca.getFetchSize()); setBindValues(bindValues); } catch (SQLException se) { - getLocalLogger() - .error( - "Error Instantiating JdbcPreparedStatementFactory SQL=<" - + sql - + ">" - + ExceptionHelper.getLocalizedMessage(se)); - throw new CpoException(se); + throw new CpoException( + "Error Instantiating JdbcPreparedStatementFactory SQL=<" + sql + ">", se); } } diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JndiJdbcDataSourceInfo.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JndiJdbcDataSourceInfo.java index d7cbb2d15..dff3b17cd 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JndiJdbcDataSourceInfo.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JndiJdbcDataSourceInfo.java @@ -24,8 +24,9 @@ import javax.naming.Context; import javax.naming.InitialContext; +import javax.naming.NamingException; import javax.sql.DataSource; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; /** * Collects the info required to instantiate a DataSource stored as a JNDI Resource. @@ -75,7 +76,7 @@ protected DataSource createDataSource() throws CpoException { jndiCtx = new InitialContext(); } datasource = (DataSource) jndiCtx.lookup(jndiName); - } catch (Exception e) { + } catch (NamingException e) { throw new CpoException("Error instantiating DataSource", e); } return datasource; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/config/JdbcCpoConfigProcessor.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/config/JdbcCpoConfigProcessor.java index de120dd73..62d462d41 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/config/JdbcCpoConfigProcessor.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/config/JdbcCpoConfigProcessor.java @@ -27,17 +27,17 @@ import java.util.TreeMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapterFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.DataSourceInfo; -import org.synchronoss.cpo.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.CpoAdapterFactory; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.DataSourceInfo; +import org.synchronoss.cpo.core.config.CpoConfigProcessor; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; import org.synchronoss.cpo.cpoconfig.CtDataSourceConfig; import org.synchronoss.cpo.cpoconfig.CtJdbcConfig; import org.synchronoss.cpo.cpoconfig.CtJdbcReadWriteConfig; import org.synchronoss.cpo.cpoconfig.CtProperty; import org.synchronoss.cpo.jdbc.*; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; /** * Processes the cpoConfig.xml data for Jdbc diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/exporter/JdbcMetaXmlObjectExporter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/exporter/JdbcMetaXmlObjectExporter.java index 0838c0b0a..469b45b64 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/exporter/JdbcMetaXmlObjectExporter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/exporter/JdbcMetaXmlObjectExporter.java @@ -22,17 +22,17 @@ * ]] */ +import org.synchronoss.cpo.core.exporter.CoreMetaXmlObjectExporter; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.synchronoss.cpo.cpometa.CtJdbcArgument; import org.synchronoss.cpo.cpometa.CtJdbcAttribute; import org.synchronoss.cpo.cpometa.ObjectFactory; import org.synchronoss.cpo.cpometa.StArgumentScope; -import org.synchronoss.cpo.exporter.CoreMetaXmlObjectExporter; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; import org.synchronoss.cpo.jdbc.JdbcCpoArgument; import org.synchronoss.cpo.jdbc.JdbcCpoAttribute; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; /** * XmlObject exporter for jdbc meta objects diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java index 976530e25..11e994c20 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java @@ -29,17 +29,17 @@ import javax.transaction.xa.XAResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.*; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.*; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.jta.CpoBaseXaResource; +import org.synchronoss.cpo.core.jta.CpoXaError; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.synchronoss.cpo.jdbc.JdbcCpoAdapter; import org.synchronoss.cpo.jdbc.JdbcCpoAdapterFactory; import org.synchronoss.cpo.jdbc.JdbcCpoTrxAdapter; -import org.synchronoss.cpo.jta.CpoBaseXaResource; -import org.synchronoss.cpo.jta.CpoXaError; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoAttribute; /** * A JdbcCpoXaAdapter wraps the XAResource processing around a JdbcCpoTrxAdapter. diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaAdapter.java index b9537e61a..746c4188f 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaAdapter.java @@ -26,19 +26,19 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.synchronoss.cpo.core.meta.AbstractCpoMetaAdapter; +import org.synchronoss.cpo.core.meta.DataTypeMapEntry; +import org.synchronoss.cpo.core.meta.DataTypeMapper; +import org.synchronoss.cpo.core.meta.domain.CpoArgument; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.parser.BoundExpressionParser; +import org.synchronoss.cpo.core.parser.ExpressionParser; import org.synchronoss.cpo.cpometa.CtArgument; import org.synchronoss.cpo.cpometa.CtAttribute; import org.synchronoss.cpo.cpometa.CtJdbcArgument; import org.synchronoss.cpo.cpometa.CtJdbcAttribute; import org.synchronoss.cpo.jdbc.JdbcCpoArgument; import org.synchronoss.cpo.jdbc.JdbcCpoAttribute; -import org.synchronoss.cpo.meta.AbstractCpoMetaAdapter; -import org.synchronoss.cpo.meta.DataTypeMapEntry; -import org.synchronoss.cpo.meta.DataTypeMapper; -import org.synchronoss.cpo.meta.domain.CpoArgument; -import org.synchronoss.cpo.meta.domain.CpoAttribute; -import org.synchronoss.cpo.parser.BoundExpressionParser; -import org.synchronoss.cpo.parser.ExpressionParser; /** * Builds and manages the Java to Datasource type mapping diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaDescriptor.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaDescriptor.java index a692f7bc5..efd32ba09 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaDescriptor.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcCpoMetaDescriptor.java @@ -22,10 +22,10 @@ * ]] */ -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; import org.synchronoss.cpo.jdbc.exporter.JdbcMetaXmlObjectExporter; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; /** * Process the Jdbc specific metadata from the xml metadata diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java index d48b03390..6ab08eb0f 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java @@ -24,7 +24,7 @@ import java.io.Serial; import java.lang.reflect.Method; -import org.synchronoss.cpo.meta.MethodMapEntry; +import org.synchronoss.cpo.core.meta.MethodMapEntry; /** * MethodMapEntry is a class defines the getters and setters for JDBC specific data classes diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapper.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapper.java index fc8776bb5..1f85c7c53 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapper.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapper.java @@ -32,8 +32,8 @@ import java.sql.ResultSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.meta.MethodMapper; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.MethodMapper; /** * MethodMapper is a class defines the getters and setters for all the JDBC specific data classes diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcResultSetCpoData.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcResultSetCpoData.java index dc3dada66..c69a99984 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcResultSetCpoData.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcResultSetCpoData.java @@ -23,10 +23,10 @@ */ import java.lang.reflect.InvocationTargetException; -import org.synchronoss.cpo.meta.MethodMapEntry; -import org.synchronoss.cpo.meta.MethodMapper; -import org.synchronoss.cpo.meta.ResultSetCpoData; -import org.synchronoss.cpo.meta.domain.CpoAttribute; +import org.synchronoss.cpo.core.meta.MethodMapEntry; +import org.synchronoss.cpo.core.meta.MethodMapper; +import org.synchronoss.cpo.core.meta.ResultSetCpoData; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; /** Result set data getter helper */ public class JdbcResultSetCpoData extends ResultSetCpoData { diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/JdbcCpoTransform.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/JdbcCpoTransform.java similarity index 93% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/JdbcCpoTransform.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/JdbcCpoTransform.java index 110b04534..5fb45734b 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/JdbcCpoTransform.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/JdbcCpoTransform.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -22,10 +22,10 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.transform.CpoTransform; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; -import org.synchronoss.cpo.transform.CpoTransform; /** * Transforms are used when standard java types to data types do not work. diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformCharArray.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformCharArray.java similarity index 96% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformCharArray.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformCharArray.java index 8054ec264..7d36c0b1a 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformCharArray.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformCharArray.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformClob.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformClob.java similarity index 97% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformClob.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformClob.java index 67ec11800..2cce2e9ac 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformClob.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformClob.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -28,7 +28,7 @@ import javax.sql.rowset.serial.SerialClob; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformGZipBytes.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformGZipBytes.java similarity index 97% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformGZipBytes.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformGZipBytes.java index bd142a33b..a0c5beee6 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformGZipBytes.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformGZipBytes.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -29,7 +29,7 @@ import java.util.zip.GZIPOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformNoOp.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformNoOp.java similarity index 98% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformNoOp.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformNoOp.java index 9576c2a6e..69ba0825f 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformNoOp.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformNoOp.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformStringChar.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformStringChar.java similarity index 96% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformStringChar.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformStringChar.java index b53c66094..d64f0e0a2 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformStringChar.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformStringChar.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -22,7 +22,7 @@ * ]] */ -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformTimestampToCalendar.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformTimestampToCalendar.java similarity index 97% rename from cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformTimestampToCalendar.java rename to cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformTimestampToCalendar.java index 31e5e7d1a..85781810a 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/transform/jdbc/TransformTimestampToCalendar.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/transform/TransformTimestampToCalendar.java @@ -1,4 +1,4 @@ -package org.synchronoss.cpo.transform.jdbc; +package org.synchronoss.cpo.jdbc.transform; /*- * [[ @@ -24,7 +24,7 @@ import java.sql.Timestamp; import java.util.Calendar; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoException; import org.synchronoss.cpo.jdbc.JdbcCallableStatementFactory; import org.synchronoss.cpo.jdbc.JdbcPreparedStatementFactory; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java index 39d34b9fc..0ce18becb 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java @@ -30,7 +30,7 @@ import org.h2.tools.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.testcontainers.containers.*; import org.testcontainers.utility.DockerImageName; import org.testng.ISuite; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigBatchTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigBatchTest.java index 3f277b550..8ca641ee1 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigBatchTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigBatchTest.java @@ -27,10 +27,10 @@ import java.util.ArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigRetrieveTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigRetrieveTest.java index a4752db9e..d1fc42294 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigRetrieveTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BigRetrieveTest.java @@ -29,10 +29,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTest.java index 6127f7fac..dd3319cb9 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTest.java @@ -26,8 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.LobValueObject; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; import org.testng.annotations.AfterClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTrxTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTrxTest.java index 6cfb132ce..ed03f4243 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTrxTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/BlobTrxTest.java @@ -26,9 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoTrxAdapter; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoTrxAdapter; import org.synchronoss.cpo.jdbc.LobValueObject; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; import org.testng.annotations.AfterClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseInsensitiveTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseInsensitiveTest.java index d2671f670..cc03847fa 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseInsensitiveTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseInsensitiveTest.java @@ -26,8 +26,8 @@ import java.sql.Timestamp; import java.util.ArrayList; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.CaseValueObject; import org.synchronoss.cpo.jdbc.CaseValueObjectBean; import org.testng.annotations.AfterClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseSensitiveTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseSensitiveTest.java index 69922181d..e587a449c 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseSensitiveTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CaseSensitiveTest.java @@ -26,8 +26,8 @@ import java.sql.Timestamp; import java.util.ArrayList; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.CaseValueObject; import org.synchronoss.cpo.jdbc.CaseValueObjectBean; import org.testng.annotations.AfterClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ConstructorTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ConstructorTest.java index 3d5ee4bf2..cbfa2d795 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ConstructorTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ConstructorTest.java @@ -27,8 +27,8 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CriteriaObjectTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CriteriaObjectTest.java index 574562a20..8f93cab64 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CriteriaObjectTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/CriteriaObjectTest.java @@ -28,12 +28,12 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.CriteriaObject; import org.synchronoss.cpo.jdbc.CriteriaObjectBean; import org.synchronoss.cpo.jdbc.ValueObject; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/DeleteObjectTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/DeleteObjectTest.java index aee1598b4..12e501135 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/DeleteObjectTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/DeleteObjectTest.java @@ -29,12 +29,12 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/EntityTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/EntityTest.java index ac91daae2..60cc78f35 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/EntityTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/EntityTest.java @@ -27,10 +27,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.meta.domain.CpoAttribute; import org.synchronoss.cpo.jdbc.JdbcCpoAttribute; -import org.synchronoss.cpo.meta.domain.CpoAttribute; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTest.java index b3d6e5124..20fccfa56 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTest.java @@ -26,9 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTrxTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTrxTest.java index e4653325c..ea604d4ea 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTrxTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExecuteTrxTest.java @@ -26,9 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoTrxAdapter; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoTrxAdapter; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExistObjectTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExistObjectTest.java index f06e86cb2..4685e3039 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExistObjectTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/ExistObjectTest.java @@ -27,12 +27,12 @@ import java.util.ArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/HotDeployTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/HotDeployTest.java index 94b812496..32bd53764 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/HotDeployTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/HotDeployTest.java @@ -30,10 +30,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InheritanceTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InheritanceTest.java index 9bdce5f3b..15815ae74 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InheritanceTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InheritanceTest.java @@ -26,8 +26,8 @@ import java.sql.Timestamp; import java.util.ArrayList; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InsertObjectTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InsertObjectTest.java index 89d1a9dbb..c410c327b 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InsertObjectTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InsertObjectTest.java @@ -28,8 +28,8 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InterleavedWhereTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InterleavedWhereTest.java index 5b75b3993..8df08c234 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InterleavedWhereTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InterleavedWhereTest.java @@ -27,11 +27,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InvalidParameterTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InvalidParameterTest.java index a5b8970b7..1ff002c3e 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InvalidParameterTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/InvalidParameterTest.java @@ -29,10 +29,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.LobValueObject; import org.synchronoss.cpo.jdbc.LobValueObjectBean; import org.synchronoss.cpo.jdbc.ValueObject; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/NativeExpressionTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/NativeExpressionTest.java index fb32b60c2..9e9b38855 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/NativeExpressionTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/NativeExpressionTest.java @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoNativeFunction; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoNativeFunction; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/OrderByTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/OrderByTest.java index 7be8d5afe..022f9540f 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/OrderByTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/OrderByTest.java @@ -29,9 +29,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoOrderBy; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoOrderBy; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RetrieveBeanTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RetrieveBeanTest.java index c9ae15704..7576dd697 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RetrieveBeanTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RetrieveBeanTest.java @@ -29,10 +29,10 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTest.java index 49320effc..480efa18b 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTest.java @@ -25,8 +25,8 @@ import static org.testng.Assert.*; import java.util.ArrayList; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTrxTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTrxTest.java index 9c3b545d1..7a80dd4bd 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTrxTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/RollbackTrxTest.java @@ -25,10 +25,10 @@ import static org.testng.Assert.*; import java.util.ArrayList; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/SelectForUpdateTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/SelectForUpdateTest.java index f3d553bdd..afc44716e 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/SelectForUpdateTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/SelectForUpdateTest.java @@ -26,11 +26,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; -import org.synchronoss.cpo.CpoTrxAdapter; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.CpoTrxAdapter; +import org.synchronoss.cpo.core.helper.ExceptionHelper; import org.synchronoss.cpo.jdbc.ValueObject; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; import org.testng.annotations.AfterClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/UpdateObjectTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/UpdateObjectTest.java index 77dc20181..6b5f4c175 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/UpdateObjectTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/UpdateObjectTest.java @@ -27,11 +27,11 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/WhereTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/WhereTest.java index d1f6b01bd..e6c270e54 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/WhereTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/WhereTest.java @@ -28,12 +28,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoOrderBy; -import org.synchronoss.cpo.CpoWhere; -import org.synchronoss.cpo.enums.Comparison; -import org.synchronoss.cpo.enums.Logical; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoOrderBy; +import org.synchronoss.cpo.core.CpoWhere; +import org.synchronoss.cpo.core.enums.Comparison; +import org.synchronoss.cpo.core.enums.Logical; import org.synchronoss.cpo.jdbc.ValueObject; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/XmlValidationTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/XmlValidationTest.java index 50a7c5981..d09733fd6 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/XmlValidationTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/adapter/XmlValidationTest.java @@ -22,8 +22,8 @@ * ]] */ +import org.synchronoss.cpo.core.helper.XmlHelper; import org.synchronoss.cpo.cpoconfig.CtCpoConfig; -import org.synchronoss.cpo.helper.XmlHelper; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/exporter/ExporterTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/exporter/ExporterTest.java index 1af48d26d..59ec4aac2 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/exporter/ExporterTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/exporter/ExporterTest.java @@ -33,20 +33,20 @@ import javax.tools.ToolProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.exporter.CpoClassSourceGenerator; +import org.synchronoss.cpo.core.exporter.CpoInterfaceSourceGenerator; +import org.synchronoss.cpo.core.exporter.CpoLegacyClassSourceGenerator; +import org.synchronoss.cpo.core.exporter.MetaXmlObjectExporter; +import org.synchronoss.cpo.core.meta.domain.CpoClass; import org.synchronoss.cpo.cpometa.CtClass; import org.synchronoss.cpo.cpometa.CtCpoMetaData; -import org.synchronoss.cpo.exporter.CpoClassSourceGenerator; -import org.synchronoss.cpo.exporter.CpoInterfaceSourceGenerator; -import org.synchronoss.cpo.exporter.CpoLegacyClassSourceGenerator; -import org.synchronoss.cpo.exporter.MetaXmlObjectExporter; import org.synchronoss.cpo.jdbc.ValueObject; import org.synchronoss.cpo.jdbc.adapter.JdbcStatics; import org.synchronoss.cpo.jdbc.adapter.ValueObjectFactory; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoClass; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jmeter/CpoJavaSamplerClient.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jmeter/CpoJavaSamplerClient.java index 550db19ac..93eefd870 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jmeter/CpoJavaSamplerClient.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jmeter/CpoJavaSamplerClient.java @@ -30,15 +30,15 @@ import org.apache.jmeter.samplers.SampleResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoException; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoException; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; import org.synchronoss.cpo.cpoconfig.CtJdbcConfig; import org.synchronoss.cpo.cpoconfig.CtJdbcReadWriteConfig; import org.synchronoss.cpo.jdbc.ValueObject; import org.synchronoss.cpo.jdbc.adapter.ValueObjectFactory; import org.synchronoss.cpo.jdbc.meta.JdbcCpoMetaDescriptor; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Parameters; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jta/JdbcXaResourceTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jta/JdbcXaResourceTest.java index 4048be8f6..319e661af 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jta/JdbcXaResourceTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/jta/JdbcXaResourceTest.java @@ -32,14 +32,14 @@ import javax.transaction.xa.Xid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.synchronoss.cpo.CpoAdapter; -import org.synchronoss.cpo.CpoAdapterFactoryManager; -import org.synchronoss.cpo.CpoOrderBy; -import org.synchronoss.cpo.helper.ExceptionHelper; +import org.synchronoss.cpo.core.CpoAdapter; +import org.synchronoss.cpo.core.CpoAdapterFactoryManager; +import org.synchronoss.cpo.core.CpoOrderBy; +import org.synchronoss.cpo.core.helper.ExceptionHelper; +import org.synchronoss.cpo.core.jta.CpoXaError; import org.synchronoss.cpo.jdbc.ValueObject; import org.synchronoss.cpo.jdbc.adapter.JdbcStatics; import org.synchronoss.cpo.jdbc.adapter.ValueObjectFactory; -import org.synchronoss.cpo.jta.CpoXaError; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Parameters; diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/parser/BoundExpressionParserTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/parser/BoundExpressionParserTest.java index f6c37b4b4..7299d1009 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/parser/BoundExpressionParserTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/parser/BoundExpressionParserTest.java @@ -27,7 +27,7 @@ import java.text.ParseException; import java.util.List; -import org.synchronoss.cpo.parser.BoundExpressionParser; +import org.synchronoss.cpo.core.parser.BoundExpressionParser; import org.testng.annotations.Test; // TODO - add more units for single quotes, double quotes, inner selects, etc diff --git a/cpo-jdbc/src/test/resources/common/LobMetaData.xml b/cpo-jdbc/src/test/resources/common/LobMetaData.xml index 7f68f0b35..55a752116 100644 --- a/cpo-jdbc/src/test/resources/common/LobMetaData.xml +++ b/cpo-jdbc/src/test/resources/common/LobMetaData.xml @@ -28,7 +28,7 @@ byte[] B_LOB LONGVARBINARY - org.synchronoss.cpo.transform.jdbc.TransformGZipBytes + org.synchronoss.cpo.jdbc.transform.TransformGZipBytes bLob2 @@ -47,7 +47,7 @@ char[] C_LOB LONGVARCHAR - org.synchronoss.cpo.transform.jdbc.TransformStringChar + org.synchronoss.cpo.jdbc.transform.TransformStringChar diff --git a/cpo-jdbc/src/test/resources/common/ValueCaseMetaData.xml b/cpo-jdbc/src/test/resources/common/ValueCaseMetaData.xml index 4c1818b75..5351d3c62 100644 --- a/cpo-jdbc/src/test/resources/common/ValueCaseMetaData.xml +++ b/cpo-jdbc/src/test/resources/common/ValueCaseMetaData.xml @@ -62,7 +62,7 @@ int attr_INTEGER INTEGER - org.synchronoss.cpo.transform.jdbc.TransformNoOp + org.synchronoss.cpo.jdbc.transform.TransformNoOp attrNumeric diff --git a/cpo-jdbc/src/test/resources/common/ValueMetaData.xml b/cpo-jdbc/src/test/resources/common/ValueMetaData.xml index 5819b3b64..c39e3cfdd 100644 --- a/cpo-jdbc/src/test/resources/common/ValueMetaData.xml +++ b/cpo-jdbc/src/test/resources/common/ValueMetaData.xml @@ -133,7 +133,7 @@ int ATTR_INTEGER INTEGER - org.synchronoss.cpo.transform.jdbc.TransformNoOp + org.synchronoss.cpo.jdbc.transform.TransformNoOp attrNumeric diff --git a/cpo-jdbc/src/test/resources/oracle/classdef/oracleLobMetaData.xml b/cpo-jdbc/src/test/resources/oracle/classdef/oracleLobMetaData.xml index 96d7764e7..86fc759e6 100644 --- a/cpo-jdbc/src/test/resources/oracle/classdef/oracleLobMetaData.xml +++ b/cpo-jdbc/src/test/resources/oracle/classdef/oracleLobMetaData.xml @@ -26,7 +26,7 @@ byte[] B_LOB BLOB - org.synchronoss.cpo.transform.jdbc.TransformGZipBytes + org.synchronoss.cpo.jdbc.transform.TransformGZipBytes bLob2 @@ -39,7 +39,7 @@ char[] C_LOB CLOB - org.synchronoss.cpo.transform.jdbc.TransformCharArray + org.synchronoss.cpo.jdbc.transform.TransformCharArray lobId diff --git a/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueCaseMetaData.xml b/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueCaseMetaData.xml index 245e92247..ac9cd9844 100644 --- a/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueCaseMetaData.xml +++ b/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueCaseMetaData.xml @@ -76,7 +76,7 @@ int attr_INTEGER INTEGER - org.synchronoss.cpo.transform.jdbc.TransformNoOp + org.synchronoss.cpo.jdbc.transform.TransformNoOp attrNumeric diff --git a/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueMetaData.xml b/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueMetaData.xml index e5cb7a873..42228d423 100644 --- a/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueMetaData.xml +++ b/cpo-jdbc/src/test/resources/oracle/classdef/oracleValueMetaData.xml @@ -145,7 +145,7 @@ int ATTR_INTEGER INTEGER - org.synchronoss.cpo.transform.jdbc.TransformNoOp + org.synchronoss.cpo.jdbc.transform.TransformNoOp attrNumeric diff --git a/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java b/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java index c5145d9ca..5a0a69e42 100644 --- a/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java +++ b/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java @@ -34,11 +34,11 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.synchronoss.cpo.exporter.CpoClassSourceGenerator; -import org.synchronoss.cpo.exporter.CpoInterfaceSourceGenerator; -import org.synchronoss.cpo.exporter.CpoLegacyClassSourceGenerator; -import org.synchronoss.cpo.meta.CpoMetaDescriptor; -import org.synchronoss.cpo.meta.domain.CpoClass; +import org.synchronoss.cpo.core.exporter.CpoClassSourceGenerator; +import org.synchronoss.cpo.core.exporter.CpoInterfaceSourceGenerator; +import org.synchronoss.cpo.core.exporter.CpoLegacyClassSourceGenerator; +import org.synchronoss.cpo.core.meta.CpoMetaDescriptor; +import org.synchronoss.cpo.core.meta.domain.CpoClass; /** Plugin goal that will generate the cpo classes based on the xml configuration file */ @Mojo( diff --git a/pom.xml b/pom.xml index 655d9ed03..f311ee631 100644 --- a/pom.xml +++ b/pom.xml @@ -188,21 +188,6 @@ true - - org.jacoco - jacoco-maven-plugin - 0.8.14 - - ${project.build.directory}/jacoco.exec - ${project.build.directory}/jacoco.exec - ${project.reporting.outputDirectory}/jacoco - - - - org.codehaus.mojo - sonar-maven-plugin - 5.2.0.4988 - @@ -346,36 +331,49 @@ - org.jacoco jacoco-maven-plugin + 0.8.14 - - default-prepare-agent + jacoco-initialize prepare-agent - default-report + jacoco-report + test report - - default-prepare-agent-integration + check-coverage - prepare-agent-integration - - - - default-report-integration - - report-integration + check + + + + + BUNDLE + + + LINE + COVEREDRATIO + 0.00 + + + BRANCH + COVEREDRATIO + 0.00 + + + + +