Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 55BD31892E for ; Sat, 2 Jan 2016 13:36:17 +0000 (UTC) Received: (qmail 76907 invoked by uid 500); 2 Jan 2016 13:36:17 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 76858 invoked by uid 500); 2 Jan 2016 13:36:16 -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 76730 invoked by uid 99); 2 Jan 2016 13:36:16 -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; Sat, 02 Jan 2016 13:36:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47C9BE0A90; Sat, 2 Jan 2016 13:36:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Date: Sat, 02 Jan 2016 13:36:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cayenne git commit: replaced NullPointerException with IllegalArguementException (checkstyle warning) replaced RuntimeExcpetion with UnsupportedOperationException (checkstyle warning) modified JavaDoc for Exception handling checked instanceof for w replaced NullPointerException with IllegalArguementException (checkstyle warning) replaced RuntimeExcpetion with UnsupportedOperationException (checkstyle warning) modified JavaDoc for Exception handling checked instanceof for wrong variable in line 318 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/349fcde6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/349fcde6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/349fcde6 Branch: refs/heads/master Commit: 349fcde6ca971c7451af9979a9830e0a4a4ab111 Parents: 1358dad Author: jotpe Authored: Mon Dec 21 14:54:03 2015 +0100 Committer: jotpe Committed: Mon Dec 21 14:54:03 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/cayenne/CayenneDataObject.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/349fcde6/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java index b950257..8508692 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java @@ -291,29 +291,34 @@ public class CayenneDataObject extends PersistentObject implements DataObject, V * @return List<? extends DataObject> of unrelated * DataObjects. If no relationship was removed an empty List is * returned. - * @throws NullPointerException + * @throws IllegalArgumentException * if no relationship could be read by relName, or if the passed * Collection is null. To clear all relationships * use an empty Collection + * @throws UnsupportedOperationException + * if the relation Collection Type is neither + * java.util.Collection nor + * java.util.Map * @since 4.0.M3 */ + @SuppressWarnings("unchecked") public List setToManyTarget(String relName, Collection values, boolean setReverse) { if (values == null) { - throw new NullPointerException(); + throw new IllegalArgumentException("values Collection is null. To clear all relationships use an empty Collection"); } Object property = readProperty(relName); if(property == null) { - throw new NullPointerException("unknown relName " + relName); + throw new IllegalArgumentException("unknown relName " + relName); } Collection old = null; if (property instanceof Map) { old = ((Map) property).values(); - } else if (dataObjects instanceof Collection) { + } else if (property instanceof Collection) { old = (Collection) property; } else { - throw new RuntimeException("setToManyTarget only operates with Map and Collection types"); + throw new UnsupportedOperationException("setToManyTarget operates only with Map or Collection types"); } // operate on a copy of passed collection