From commits-return-22867-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org Fri Feb 2 14:07:39 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 9AB8818066D for ; Fri, 2 Feb 2018 14:07:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 89CF8160C57; Fri, 2 Feb 2018 13:07:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 25548160C5A for ; Fri, 2 Feb 2018 14:07:36 +0100 (CET) Received: (qmail 14684 invoked by uid 500); 2 Feb 2018 13:07:36 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 14540 invoked by uid 99); 2 Feb 2018 13:07:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2018 13:07:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08376E96D8; Fri, 2 Feb 2018 13:07:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Date: Fri, 02 Feb 2018 13:07:39 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/11] cayenne git commit: Code check and code-coverage and code-quality options Code check and code-coverage and code-quality options Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ea745fd6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ea745fd6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ea745fd6 Branch: refs/heads/master Commit: ea745fd6d261454b6074c7b42a56fe4d62ab8c85 Parents: c47c03d Author: Arseni Bulatski Authored: Fri Jan 26 12:14:56 2018 +0300 Committer: Arseni Bulatski Committed: Fri Jan 26 12:14:56 2018 +0300 ---------------------------------------------------------------------- .../src/main/resources/cayenne-checkstyle.xml | 82 ------ .../src/main/resources/cayenne-pmd.xml | 295 ------------------- build-tools/pom.xml | 32 -- cayenne-checkstyle.xml | 82 ++++++ .../main/java/org/apache/cayenne/di/Key.java | 2 +- .../di/spi/DefaultAdhocObjectFactory.java | 6 +- .../apache/cayenne/di/spi/DefaultInjector.java | 4 +- .../cayenne/lifecycle/id/EntityIdCoder.java | 2 +- .../apache/cayenne/lifecycle/id/IdCoder.java | 2 +- .../cayenne/lifecycle/id/StringIdQuery.java | 4 +- .../configuration/osgi/OsgiModuleBuilder.java | 2 +- cayenne-pmd.xml | 295 +++++++++++++++++++ ...ompatibilityDataChannelDescriptorLoader.java | 2 +- .../cayenne/project/FileProjectSaver.java | 2 +- .../java/org/apache/cayenne/CayenneContext.java | 4 +- pom.xml | 9 +- 16 files changed, 400 insertions(+), 425 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml ---------------------------------------------------------------------- diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml deleted file mode 100644 index 90587cb..0000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml ---------------------------------------------------------------------- diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml deleted file mode 100644 index de950e7..0000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - 3 - - - - 1 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 2 - - - - - - 3 - - - 3 - - - 1 - - - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 3 - - - 3 - - - 1 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 1 - - - 3 - - - - 1 - - - 1 - - - 1 - - - 3 - - - - - - 1 - - - 1 - - - 1 - - - 3 - - - 3 - - - - - - 1 - - - - - - 1 - - - 1 - - - 1 - - - 3 - - - 3 - - - 1 - - - 3 - - - - - - 1 - - - 3 - - - 1 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/build-tools/pom.xml ---------------------------------------------------------------------- diff --git a/build-tools/pom.xml b/build-tools/pom.xml index ddba56e..f0dfa0e 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -57,37 +57,5 @@ - - - code-quality - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - true - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - - - true - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-checkstyle.xml ---------------------------------------------------------------------- diff --git a/cayenne-checkstyle.xml b/cayenne-checkstyle.xml new file mode 100644 index 0000000..90587cb --- /dev/null +++ b/cayenne-checkstyle.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-di/src/main/java/org/apache/cayenne/di/Key.java ---------------------------------------------------------------------- diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/Key.java b/cayenne-di/src/main/java/org/apache/cayenne/di/Key.java index 47c9f1d..d3c35df 100644 --- a/cayenne-di/src/main/java/org/apache/cayenne/di/Key.java +++ b/cayenne-di/src/main/java/org/apache/cayenne/di/Key.java @@ -81,7 +81,7 @@ public class Key { protected Key(TypeLiteral type, String bindingName) { if (type == null) { - throw new IllegalArgumentException("Null key type"); + throw new NullPointerException("Null key type"); } this.typeLiteral = type; http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java index 241b6b6..ab2728d 100644 --- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java +++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java @@ -50,11 +50,11 @@ public class DefaultAdhocObjectFactory implements AdhocObjectFactory { public T newInstance(Class superType, String className) { if (superType == null) { - throw new IllegalArgumentException("Null superType"); + throw new NullPointerException("Null superType"); } if (className == null) { - throw new IllegalArgumentException("Null className"); + throw new NullPointerException("Null className"); } Class type = (Class) getJavaClass(className); @@ -82,7 +82,7 @@ public class DefaultAdhocObjectFactory implements AdhocObjectFactory { // is there a better way to get array class from string name? if (className == null) { - throw new IllegalArgumentException("Null class name"); + throw new NullPointerException("Null class name"); } ClassLoader classLoader = classLoaderManager.getClassLoader(className.replace('.', '/')); http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java ---------------------------------------------------------------------- diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java index e9dfdb4..a998cf4 100644 --- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java +++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java @@ -80,7 +80,7 @@ public class DefaultInjector implements Injector { Binding getBinding(Key key) throws DIRuntimeException { if (key == null) { - throw new IllegalArgumentException("Null key"); + throw new NullPointerException("Null key"); } // may return null - this is intentionally allowed in this non-public method @@ -148,7 +148,7 @@ public class DefaultInjector implements Injector { public Provider getProvider(Key key) throws DIRuntimeException { if (key == null) { - throw new IllegalArgumentException("Null key"); + throw new NullPointerException("Null key"); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java index d0a6227..092aa27 100644 --- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java +++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java @@ -216,7 +216,7 @@ public class EntityIdCoder { private Converter create(Class type) { if (type == null) { - throw new IllegalArgumentException("Null type"); + throw new NullPointerException("Null type"); } if (Long.class.isAssignableFrom(type)) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java index bad72f6..696a2b4 100644 --- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java +++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java @@ -63,7 +63,7 @@ public class IdCoder { public String getStringId(Persistent object) { if (object == null) { - throw new IllegalArgumentException("Null object"); + throw new NullPointerException("Null object"); } ObjectId id = object.getObjectId(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java index d319f09..89646d2 100644 --- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java +++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java @@ -62,7 +62,7 @@ public class StringIdQuery implements Query { private static Collection toCollection(String... stringIds) { if (stringIds == null) { - throw new IllegalArgumentException("Null stringIds"); + throw new NullPointerException("Null stringIds"); } return Arrays.asList(stringIds); @@ -88,7 +88,7 @@ public class StringIdQuery implements Query { public void addStringIds(String... ids) { if (ids == null) { - throw new IllegalArgumentException("Null ids"); + throw new NullPointerException("Null ids"); } boolean changed = false; http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java ---------------------------------------------------------------------- diff --git a/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java b/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java index 6214452..481f220 100644 --- a/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java +++ b/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java @@ -34,7 +34,7 @@ public class OsgiModuleBuilder { public static OsgiModuleBuilder forProject(Class typeFromProjectBundle) { if (typeFromProjectBundle == null) { - throw new IllegalArgumentException("Null 'typeFromProjectBundle'"); + throw new NullPointerException("Null 'typeFromProjectBundle'"); } return new OsgiModuleBuilder(typeFromProjectBundle); http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-pmd.xml ---------------------------------------------------------------------- diff --git a/cayenne-pmd.xml b/cayenne-pmd.xml new file mode 100644 index 0000000..de950e7 --- /dev/null +++ b/cayenne-pmd.xml @@ -0,0 +1,295 @@ + + + + + + 3 + + + + 1 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 2 + + + + + + 3 + + + 3 + + + 1 + + + + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 3 + + + 3 + + + 1 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 1 + + + 3 + + + + 1 + + + 1 + + + 1 + + + 3 + + + + + + 1 + + + 1 + + + 1 + + + 3 + + + 3 + + + + + + 1 + + + + + + 1 + + + 1 + + + 1 + + + 3 + + + 3 + + + 1 + + + 3 + + + + + + 1 + + + 3 + + + 1 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java index bbe7f1b..85dd6d5 100644 --- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java +++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/configuration/xml/CompatibilityDataChannelDescriptorLoader.java @@ -63,7 +63,7 @@ public class CompatibilityDataChannelDescriptorLoader extends XMLDataChannelDesc @Override public ConfigurationTree load(Resource configurationResource) throws ConfigurationException { if (configurationResource == null) { - throw new IllegalArgumentException("Null configurationResource"); + throw new NullPointerException("Null configurationResource"); } if(!(upgradeServiceProvider.get() instanceof CompatibilityUpgradeService)) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java index e45ca89..0d6af44 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java @@ -88,7 +88,7 @@ public class FileProjectSaver implements ProjectSaver { @Override public void saveAs(Project project, Resource baseDirectory) { if (baseDirectory == null) { - throw new IllegalArgumentException("Null 'baseDirectory'"); + throw new NullPointerException("Null 'baseDirectory'"); } save(project, baseDirectory, false); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContext.java ---------------------------------------------------------------------- diff --git a/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContext.java b/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContext.java index c8b3620..3f111db 100644 --- a/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContext.java +++ b/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContext.java @@ -240,7 +240,7 @@ public class CayenneContext extends BaseContext { @Override public T newObject(Class persistentClass) { if (persistentClass == null) { - throw new IllegalArgumentException("Persistent class can't be null."); + throw new NullPointerException("Persistent class can't be null."); } ObjEntity entity = getEntityResolver().getObjEntity(persistentClass); @@ -262,7 +262,7 @@ public class CayenneContext extends BaseContext { @Override public void registerNewObject(Object object) { if (object == null) { - throw new IllegalArgumentException("An attempt to register null object."); + throw new NullPointerException("An attempt to register null object."); } ObjEntity entity = getEntityResolver().getObjEntity(object.getClass()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/ea745fd6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d53e068..453dda8 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,8 @@ tutorials docs assembly - + cayenne-module-parent + jira https://issues.apache.org/jira/browse/CAY @@ -741,6 +742,10 @@ 3.8 + maven-checkstyle-plugin + 3.0.0 + + maven-enforcer-plugin 1.4.1 @@ -959,6 +964,7 @@ code-quality + org.apache.maven.plugins @@ -1037,6 +1043,7 @@ 2.0 +