#1150 - Refactor convert RawSql and RawSqlBuilder into interfaces and push the parsers into io.ebeaninternal

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
-import io.ebean.RawSql;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
@@ -64,6 +63,7 @@ import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.query.SplitName;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
@@ -110,7 +110,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
 
   private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
 
-  private final Map<String, RawSql> namedRawSql;
+  private final Map<String, SpiRawSql> namedRawSql;
 
   private final Map<String, String> namedQuery;
 
@@ -1112,7 +1112,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the named RawSql query.
    */
-  public RawSql getNamedRawSql(String named) {
+  public SpiRawSql getNamedRawSql(String named) {
     return namedRawSql.get(named);
   }
 
@@ -2932,7 +2932,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
     if (idProperty != null && !idProperty.isEmbedded()) {
       OrderBy<T> orderBy = query.getOrderBy();
       if (orderBy == null || orderBy.isEmpty()) {
-        RawSql rawSql = query.getRawSql();
+        SpiRawSql rawSql = query.getRawSql();
         if (rawSql != null) {
           query.order(rawSql.getSql().getOrderBy());
         }

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import io.ebean.RawSql;
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.DocStore;
 import io.ebean.annotation.DocStoreMode;
@@ -30,6 +29,7 @@ import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.idgen.UuidIdGenerator;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
@@ -49,7 +49,7 @@ public class DeployBeanDescriptor<T> {
 
   private static final Map<String, String> EMPTY_NAMED_QUERY = new HashMap<>();
 
-  private static final Map<String, RawSql> EMPTY_RAW_MAP = new HashMap<>();
+  private static final Map<String, SpiRawSql> EMPTY_RAW_MAP = new HashMap<>();
 
   private static class PropOrder implements Comparator<DeployBeanProperty> {
 
@@ -75,7 +75,7 @@ public class DeployBeanDescriptor<T> {
    */
   private LinkedHashMap<String, DeployBeanProperty> propMap = new LinkedHashMap<>();
 
-  private Map<String, RawSql> namedRawSql;
+  private Map<String, SpiRawSql> namedRawSql;
 
   private Map<String, String> namedQuery;
 
@@ -1100,14 +1100,14 @@ public class DeployBeanDescriptor<T> {
   /**
    * Return the named RawSql queries.
    */
-  public Map<String, RawSql> getNamedRawSql() {
+  public Map<String, SpiRawSql> getNamedRawSql() {
     return (namedRawSql != null) ? namedRawSql : EMPTY_RAW_MAP;
   }
 
   /**
    * Add a named RawSql from ebean.xml file.
    */
-  public void addRawSql(String name, RawSql rawSql) {
+  public void addRawSql(String name, SpiRawSql rawSql) {
     if (namedRawSql == null) {
       namedRawSql = new HashMap<>();
     }

src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy.parse;
 
 import io.ebean.RawSql;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
@@ -81,7 +82,7 @@ public class DeployBeanInfo<T> {
    * Add named RawSql from ebean.xml.
    */
   public void addRawSql(String name, RawSql rawSql) {
-    descriptor.addRawSql(name, rawSql);
+    descriptor.addRawSql(name, (SpiRawSql)rawSql);
   }
 
   /**