[cayenne] branch master updated: CAY-2547 CayenneDataObject serialization issue bad cherry-pick..

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e7e75c  CAY-2547 CayenneDataObject serialization issue   bad 
cherry-pick..
7e7e75c is described below

commit 7e7e75c2095f3572b2fd02b01b3b360e5ea0fd65
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Feb 28 17:11:03 2019 +0300

    CAY-2547 CayenneDataObject serialization issue
      bad cherry-pick..
---
 .../src/test/java/org/apache/cayenne/DataObjectSerializationIT.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
index 96e7584..b675f21 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
@@ -131,7 +131,7 @@ public class DataObjectSerializationIT extends ServerCase {
 
     @Test
     public void testSerializeModifiedMapBasedObject() throws Exception {
-        ObjectId objectId = new ObjectId("test", "id", 42);
+        ObjectId objectId = ObjectId.of("test", "id", 42);
 
         CayenneDataObject dataObject = new CayenneDataObject();
         dataObject.setObjectContext(context);
@@ -148,7 +148,7 @@ public class DataObjectSerializationIT extends ServerCase {
 
     @Test
     public void testSerializeCommittedMapBasedObject() throws Exception {
-        ObjectId objectId = new ObjectId("test", "id", 42);
+        ObjectId objectId = ObjectId.of("test", "id", 42);
 
         CayenneDataObject dataObject = new CayenneDataObject();
         dataObject.setObjectContext(context);