From 2d93d592c10baa5ac28b8ce066065e3ca0976f16 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Tue, 8 Mar 2016 21:34:27 +1300 Subject: [PATCH] #593 - Refactor SPI - Move methods from ElPropertyValue to ExpressionPath --- src/main/java/com/avaje/ebean/plugin/BeanType.java | 8 -------- .../avaje/ebeaninternal/server/deploy/BeanDescriptor.java | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/main/java/com/avaje/ebean/plugin/BeanType.java b/src/main/java/com/avaje/ebean/plugin/BeanType.java index 3e19ca804..71fb1936a 100644 --- a/src/main/java/com/avaje/ebean/plugin/BeanType.java +++ b/src/main/java/com/avaje/ebean/plugin/BeanType.java @@ -5,12 +5,9 @@ import com.avaje.ebean.event.BeanFindController; import com.avaje.ebean.event.BeanPersistController; import com.avaje.ebean.event.BeanPersistListener; import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.text.json.JsonReadOptions; import com.avaje.ebeaninternal.api.SpiQuery; import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; -import com.fasterxml.jackson.core.JsonParser; -import java.io.IOException; import java.util.Collection; /** @@ -155,11 +152,6 @@ public interface BeanType { */ BeanDocType docStore(); - /** - * Read the JSON content returning the bean. - */ - T jsonRead(JsonParser parser, JsonReadOptions readOptions, Object objectMapper) throws IOException; - /** * Add the discriminator value to the query if needed. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index c949f2836..f5a8ee4a0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -2709,9 +2709,4 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return jsonHelp.jsonReadObject(jsonRead, path); } - @Override - public T jsonRead(JsonParser parser, JsonReadOptions readOptions, Object objectMapper) throws IOException { - ReadJson jsonRead = new ReadJson(this, parser, readOptions, objectMapper); - return jsonRead(jsonRead, null); - } }