From 245cbb0ea1e3cabdae03d9262ae1c2ea17c266ad Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 11:27:00 +1200 Subject: [PATCH] #342 - Remove deprecated method - JsonContext createJsonContext() ... migrate to json() --- src/main/java/com/avaje/ebean/Ebean.java | 8 -------- src/main/java/com/avaje/ebean/EbeanServer.java | 6 ------ .../avaje/ebeaninternal/server/core/DefaultServer.java | 6 ------ .../com/avaje/ebeaninternal/api/TDSpiEbeanServer.java | 5 ----- 4 files changed, 25 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index 88e975c60..fae449bcf 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -1487,13 +1487,5 @@ public final class Ebean { public static JsonContext json() { return serverMgr.getDefaultServer().json(); } - - /** - * Return the JsonContext for reading/writing JSON. - * @deprecated Please use #json instead. - */ - public static JsonContext createJsonContext() { - return json(); - } } diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 1fe6b7393..cdfc5a2bf 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1745,12 +1745,6 @@ public interface EbeanServer { */ void runCacheWarming(Class beanType); - /** - * Return the JsonContext for reading/writing JSON. - * @deprecated Please use #json instead. - */ - JsonContext createJsonContext(); - /** * Return the JsonContext for reading/writing JSON. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java index 84ee791f9..1ae352161 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1974,12 +1974,6 @@ public final class DefaultServer implements SpiEbeanServer { // immutable thread safe so return shared instance return jsonContext; } - - @Override - public JsonContext createJsonContext() { - return json(); - } - @Override public void collectQueryStats(ObjectGraphNode node, long loadedBeanCount, long timeMicros) { diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index e540746df..69d26b4f6 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -648,11 +648,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public JsonContext createJsonContext() { - return null; - } - @Override public JsonContext json() { return null;