From ba871d66843b1b4b5a643c2820071d8cb3572f49 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Tue, 8 Mar 2016 21:09:49 +1300 Subject: [PATCH] #593 - Refactor SPI - Move methods from ElPropertyValue to ExpressionPath --- .../avaje/ebeaninternal/server/el/ElPropertyChain.java | 10 ---------- .../avaje/ebeaninternal/server/el/ElPropertyValue.java | 6 ------ 2 files changed, 16 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java index 8c5817ff0..031b601d2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java @@ -172,16 +172,6 @@ public class ElPropertyChain implements ElPropertyValue { return lastElPropertyValue.getAssocIdInValueExpr(size); } - public int getDeployOrder() { - int i = lastBeanProperty.getDeployOrder(); - int max = chain.length - 1; - for (int j = 0; j < max; j++) { - int xtra = ((max - j) * 1000) * chain[j].getDeployOrder(); - i += xtra; - } - return i; - } - public boolean isAssocId() { return assocId; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java index d48361efd..cd96fb5d5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java @@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.el; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.text.StringParser; /** * The expression language object that can get values. @@ -55,11 +54,6 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath { */ boolean isDbEncrypted(); - /** - * Return the deploy order for the property. - */ - int getDeployOrder(); - /** * Return the value ensuring objects prior to the top scalar property are * automatically populated.