From 4ce8da7ebf694fe2a6fd2eb628670c6da1947d2f Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Tue, 11 Sep 2012 17:40:17 +0200
Subject: [PATCH] DATAMONGO-536 - Fixed package cycle introduced by
 SerializationUtils.

---
 .../org/springframework/data/mongodb/core/MongoTemplate.java   | 2 +-
 .../org/springframework/data/mongodb/core/query/Query.java     | 2 +-
 .../data/mongodb/core/{ => query}/SerializationUtils.java      | 2 +-
 .../data/mongodb/core/SerializationUtilsUnitTests.java         | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/{ => query}/SerializationUtils.java (98%)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index 9bed73396..055590447 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
index b24015bf2..c92fa335d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 import static org.springframework.util.ObjectUtils.*;
 
 import java.util.ArrayList;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SerializationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
similarity index 98%
rename from spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SerializationUtils.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
index d21098843..b11948220 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SerializationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.core;
+package org.springframework.data.mongodb.core.query;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
index 883729bb6..78ef19c03 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
@@ -17,12 +17,13 @@ package org.springframework.data.mongodb.core;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.util.Arrays;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
+import org.springframework.data.mongodb.core.query.SerializationUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;