Merge remote-tracking branch 'remotes/parent/pr/261' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d1c214f4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d1c214f4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d1c214f4 Branch: refs/heads/master Commit: d1c214f4c3c00738648f262f951515605722b65a Parents: 96914de 50bed16 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Feb 2 15:36:48 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Feb 2 15:36:48 2018 +0300 ---------------------------------------------------------------------- build-tools/cayenne-checkers/pom.xml | 9 +- .../src/main/resources/cayenne-checkstyle.xml | 16 +- .../src/main/resources/cayenne-pmd.xml | 138 ++---- .../main/resources/cayenne-tests-checkstyle.xml | 3 - .../src/main/resources/cayenne-tests-pmd.xml | 48 +-- build-tools/cayenne-coverage/pom.xml | 125 ------ build-tools/pom.xml | 1 + cayenne-cache-invalidation/pom.xml | 1 - .../CacheInvalidationModuleProvider.java | 4 +- .../org/apache/cayenne/gen/StringUtils.java | 9 +- cayenne-client-jetty/pom.xml | 24 -- .../rop/JettyHttpClientConnectionProvider.java | 2 +- .../cayenne/rop/http/JettyHttpROPConnector.java | 5 +- cayenne-client/pom.xml | 22 - .../remote/hessian/DataRowDeserializer.java | 2 +- .../java/org/apache/cayenne/rop/ROPUtil.java | 12 +- .../cayenne/rop/http/HttpROPConnector.java | 2 +- cayenne-commitlog/pom.xml | 1 - .../CommitLogServerModuleProvider.java | 4 +- cayenne-crypto/pom.xml | 25 -- cayenne-dbcp2/pom.xml | 8 - .../merge/factory/IngresMergerTokenFactory.java | 3 +- .../reverse/dbimport/DefaultDbImportAction.java | 4 +- .../reverse/dbimport/FilterContainer.java | 5 +- .../dbsync/reverse/dbimport/PatternParam.java | 4 +- cayenne-di/pom.xml | 24 -- .../java/org/apache/cayenne/di/TypeLiteral.java | 10 +- .../java/org/apache/cayenne/di/spi/DIGraph.java | 3 +- .../jcache/JCacheServerModuleProvider.java | 4 +- cayenne-joda/pom.xml | 9 - cayenne-lifecycle/pom.xml | 23 - cayenne-project-compatibility/pom.xml | 1 - ...ompatibilityDataChannelDescriptorLoader.java | 2 +- .../compatibility/DefaultDocumentProvider.java | 2 +- cayenne-project/pom.xml | 24 -- .../project/upgrade/DefaultUpgradeService.java | 12 +- .../upgrade/handlers/UpgradeHandler_V9.java | 6 +- cayenne-protostuff/pom.xml | 25 -- cayenne-rop-server/pom.xml | 1 - .../java/org/apache/cayenne/CayenneContext.java | 11 +- .../cayenne/CayenneContextChildDiffLoader.java | 5 +- .../cayenne/CayenneContextMergeHandler.java | 17 +- .../remote/RemoteIncrementalFaultList.java | 9 +- .../apache/cayenne/remote/RemoteSession.java | 11 +- cayenne-server/pom.xml | 7 +- .../apache/cayenne/ObjectContextChangeLog.java | 3 +- .../apache/cayenne/ObjectContextStateLog.java | 6 +- .../org/apache/cayenne/access/DataRowStore.java | 2 +- .../org/apache/cayenne/access/DbGenerator.java | 2 +- .../cayenne/access/IncrementalFaultList.java | 9 +- .../ejbql/EJBQLConditionTranslator.java | 2 +- .../translator/select/QualifierTranslator.java | 10 +- .../cayenne/access/types/CalendarType.java | 9 +- .../cayenne/access/types/ExtendedEnumType.java | 6 +- .../cayenne/ashwood/AshwoodEntitySorter.java | 14 +- .../ashwood/graph/DepthFirstStampSearch.java | 3 +- .../ashwood/graph/FilterArcIterator.java | 6 +- .../cayenne/ashwood/graph/FilterIteration.java | 6 +- .../ashwood/graph/IndegreeTopologicalSort.java | 3 +- .../cayenne/ashwood/graph/MapDigraph.java | 30 +- .../cayenne/ashwood/graph/StrongConnection.java | 16 +- .../DefaultDataChannelDescriptorMerger.java | 2 +- .../configuration/Rot13PasswordEncoder.java | 5 +- .../configuration/Rot47PasswordEncoder.java | 3 +- .../server/DataDomainProvider.java | 2 +- .../xml/DataChannelChildrenHandler.java | 2 +- .../configuration/xml/DataChannelHandler.java | 2 +- .../xml/DataSourceChildrenHandler.java | 2 +- .../configuration/xml/DbEntityHandler.java | 4 +- .../xml/DefaultHandlerFactory.java | 2 +- .../configuration/xml/ObjEntityHandler.java | 4 +- .../xml/QueryDescriptorHandler.java | 4 +- .../xml/XMLDataChannelDescriptorLoader.java | 2 +- .../org/apache/cayenne/conn/DataSourceInfo.java | 38 +- .../datasource/UnmanagedPoolingDataSource.java | 2 +- .../apache/cayenne/dba/mysql/MySQLAdapter.java | 13 +- .../apache/cayenne/exp/ExpressionFactory.java | 11 +- .../apache/cayenne/exp/ExpressionParameter.java | 6 + .../java/org/apache/cayenne/exp/Property.java | 16 +- .../log/FormattedSlf4jJdbcEventLogger.java | 3 +- .../cayenne/log/Slf4jJdbcEventLogger.java | 3 +- .../apache/cayenne/map/CallbackDescriptor.java | 3 +- .../org/apache/cayenne/map/DbKeyGenerator.java | 6 +- .../cayenne/map/PathComponentIterator.java | 3 +- .../cayenne/map/QueryDescriptorLoader.java | 11 +- .../java/org/apache/cayenne/query/Ordering.java | 20 +- .../cayenne/reflect/ConverterFactory.java | 57 ++- .../reflect/PersistentDescriptorFactory.java | 6 +- .../apache/cayenne/reflect/ToAnyConverter.java | 8 +- .../main/java/org/apache/cayenne/util/Util.java | 12 +- cayenne-velocity/pom.xml | 1 - cayenne-web/pom.xml | 8 - pom.xml | 424 +++++++++---------- 93 files changed, 591 insertions(+), 904 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d1c214f4/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d1c214f4/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/ObjEntityHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d1c214f4/pom.xml ----------------------------------------------------------------------
