This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit fc8d4e77320f4462d0133b96030af57673e467bb Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Sep 5 10:51:47 2014 +0200 Use MoreObjects.firstNonNull instead of Objects.firstNonNull (deprecated) --- .../java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java | 4 ++-- .../org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java index 279c98d..dab971d 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java @@ -25,7 +25,7 @@ package org.nuiton.topia.persistence; */ import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -429,7 +429,7 @@ public class HqlAndParametersBuilder<E extends TopiaEntity> { // Look for the parent alias if already computed String previousPath = path.toString(); - String previousAlias = Objects.firstNonNull(aliases.get(previousPath), alias); + String previousAlias = MoreObjects.firstNonNull(aliases.get(previousPath), alias); // Compute the current path and look for its alias if (path.length() > 0) { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java index 360d431..b01cc82 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java @@ -35,7 +35,7 @@ import java.beans.VetoableChangeSupport; import java.lang.ref.WeakReference; import java.util.Date; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * Base class of each entity. It contains the common attributes and a part of the entities event support. @@ -98,7 +98,7 @@ public abstract class AbstractTopiaEntity implements TopiaEntity { } protected TopiaFiresSupport getFiresSupport() { - TopiaFiresSupport result = Objects.firstNonNull(getFiresSupportOrNull(), DEFAULT_INSTANCE); + TopiaFiresSupport result = MoreObjects.firstNonNull(getFiresSupportOrNull(), DEFAULT_INSTANCE); return result; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.