From 156cb0c426073330203c829a2776af6e48a9555e Mon Sep 17 00:00:00 2001 From: Ruben Dijkstra Date: Fri, 6 Feb 2015 17:20:36 +0100 Subject: [PATCH 1/2] Replace occurrence of java.util.Objects with com.google.common.base.Objects The former is not available on JDK6. fixes #1162 --- .../main/java/com/querydsl/core/support/ReplaceVisitor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java index c7fdfc402..bce2283d7 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java +++ b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java @@ -15,8 +15,8 @@ package com.querydsl.core.support; import java.util.List; import java.util.Map; -import java.util.Objects; +import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.querydsl.core.*; import com.querydsl.core.types.*; @@ -71,7 +71,7 @@ public class ReplaceVisitor implements Visitor, C> { if (element instanceof Expression) { element = ((Expression) element).accept(this, context); } - if (parent.equals(metadata.getParent()) && Objects.equals(element, metadata.getElement())) { + if (parent.equals(metadata.getParent()) && Objects.equal(element, metadata.getElement())) { return expr; } else { metadata = new PathMetadata(parent, element, metadata.getPathType()); From f1fef3be302300dc3ef701d3b8aa3eae776a0533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sat, 7 Feb 2015 14:39:37 +0200 Subject: [PATCH 2/2] Rename class --- ...SQLExceptionWrapper.java => JavaSE7SQLExceptionWrapper.java} | 2 +- .../main/java/com/querydsl/sql/support/SQLExceptionWrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename querydsl-sql/src/main/java/com/querydsl/sql/support/{JaveSE7SQLExceptionWrapper.java => JavaSE7SQLExceptionWrapper.java} (96%) diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java similarity index 96% rename from querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java rename to querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java index 79a55f2a3..c1e2de175 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java @@ -23,7 +23,7 @@ import com.querydsl.core.QueryException; * * @author Shredder121 */ -class JaveSE7SQLExceptionWrapper extends SQLExceptionWrapper { +class JavaSE7SQLExceptionWrapper extends SQLExceptionWrapper { @Override public RuntimeException wrap(SQLException exception) { diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java index 219f45c34..86b57aa4e 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java @@ -35,7 +35,7 @@ public abstract class SQLExceptionWrapper { double javaVersion = Double.parseDouble(JAVA_SPECIFICATION_VERSION.value()); if (javaVersion > 1.6) { - INSTANCE = new JaveSE7SQLExceptionWrapper(); + INSTANCE = new JavaSE7SQLExceptionWrapper(); } else { INSTANCE = new JavaSE6SQLExceptionWrapper(); }