[15x] Remove Named DTO queries and External Mapping (loading named queries)

ebean-api/src/main/java/io/ebean/Database.java

@@ -442,18 +442,6 @@ public interface Database {
    */
   <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
 
-  /**
-   * Create a named Query for DTO beans.
-   * <p>
-   * DTO beans are just normal bean like classes with public constructor(s) and setters.
-   * They do not need to be registered with DB before use.
-   *
-   * @param dtoType    The type of the DTO bean the rows will be mapped into.
-   * @param namedQuery The name of the query
-   * @param <T>        The type of the DTO bean.
-   */
-  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
-
   /**
    * Look to execute a native sql query that does not return beans but instead
    * returns SqlRow or direct access to ResultSet.

ebean-core/pom.xml

@@ -49,11 +49,6 @@
       <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.18.0</version>
-    </dependency>
 
     <dependency>
       <groupId>org.antlr</groupId>

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -790,11 +790,6 @@ public static TemporalMode of(SpiQuery<?> query) {
    */
   boolean tuneFetchProperties(OrmQueryDetail detail);
 
-  /**
-   * If this is a RawSql based entity set the default RawSql if not set.
-   */
-  void setDefaultRawSqlIfRequired();
-
   /**
    * Set to true if this query has been tuned by autoTune.
    */

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -887,16 +887,6 @@ public <T> DtoQuery<T> findDto(Class<T> dtoType, String sql) {
     return new DefaultDtoQuery<>(this, descriptor, sql.trim());
   }
 
-  @Override
-  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
-    DtoBeanDescriptor<T> descriptor = dtoBeanManager.descriptor(dtoType);
-    String sql = descriptor.namedRawSql(namedQuery);
-    if (sql == null) {
-      throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName());
-    }
-    return new DefaultDtoQuery<>(this, descriptor, sql);
-  }
-
   @Override
   public <T> DtoQuery<T> findDto(Class<T> dtoType, SpiQuery<?> ormQuery) {
     DtoBeanDescriptor<T> descriptor = dtoBeanManager.descriptor(dtoType);
@@ -960,7 +950,6 @@ private <T> SpiOrmQueryRequest<T> buildQueryRequest(SpiQuery<T> query) {
       transaction = currentServerTransaction();
     }
     if (!query.isRawSql()) {
-      query.setDefaultRawSqlIfRequired();
       if (query.isAutoTunable() && !autoTuneService.tuneQuery(query)) {
         // use deployment FetchType.LAZY/EAGER annotations
         // to define the 'default' select clause

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -50,8 +50,6 @@
 import io.ebeaninternal.server.transaction.*;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmapping.api.XmapEbean;
-import io.ebeaninternal.xmapping.api.XmapService;
 import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
@@ -123,10 +121,9 @@ public final class InternalConfiguration {
     this.serverCachePlugin = initServerCachePlugin();
     this.cacheManager = initCacheManager();
 
-    final InternalConfigXmlMap xmlMap = initExternalMapping();
-    this.dtoBeanManager = new DtoBeanManager(typeManager, xmlMap.readDtoMapping());
+    this.dtoBeanManager = new DtoBeanManager(typeManager);
     this.beanDescriptorManager = new BeanDescriptorManager(this);
-    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlMap.xmlDeployment());
+    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy();
     Map<String, String> draftTableMap = beanDescriptorManager.draftTableMap();
     beanDescriptorManager.scheduleBackgroundTrim();
     this.dataTimeZone = initDataTimeZone();
@@ -138,11 +135,6 @@ public boolean isJacksonCorePresent() {
     return jacksonCorePresent;
   }
 
-  private InternalConfigXmlMap initExternalMapping() {
-    final List<XmapEbean> xmEbeans = readExternalMapping();
-    return new InternalConfigXmlMap(xmEbeans, config.getClassLoadConfig().getClassLoader());
-  }
-
   private <S> S service(Class<S> cls) {
     S service = config.getServiceObject(cls);
     if (service != null) {
@@ -152,14 +144,6 @@ private <S> S service(Class<S> cls) {
     }
   }
 
-  private List<XmapEbean> readExternalMapping() {
-    final XmapService xmapService = service(XmapService.class);
-    if (xmapService == null) {
-      return Collections.emptyList();
-    }
-    return xmapService.read(config.getClassLoadConfig().getClassLoader(), config.getMappingLocations());
-  }
-
   private SpiLogManager initLogManager() {
     // allow plugin - i.e. capture executed SQL for testing/asserts
     SpiLoggerFactory loggerFactory = service(SpiLoggerFactory.class);

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -89,8 +89,6 @@ public enum EntityType {
   private final ConcurrentHashMap<String, STreeProperty> dynamicProperty = new ConcurrentHashMap<>();
   private final ConcurrentHashMap<String, Map<String, String>> pathMaps = new ConcurrentHashMap<>();
 
-  private final Map<String, SpiRawSql> namedRawSql;
-  private final Map<String, String> namedQuery;
   private final boolean multiValueSupported;
   private boolean batchEscalateOnCascadeInsert;
   private boolean batchEscalateOnCascadeDelete;
@@ -245,8 +243,6 @@ public BeanDescriptor(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy) {
     this.rootBeanType = PersistenceContextUtil.root(beanType);
     this.prototypeEntityBean = createPrototypeEntityBean(beanType);
     this.iudMetrics = new BeanIudMetrics(name);
-    this.namedQuery = deploy.getNamedQuery();
-    this.namedRawSql = deploy.getNamedRawSql();
     this.inheritInfo = deploy.getInheritInfo();
     this.beanFinder = deploy.getBeanFinder();
     this.persistController = deploy.getPersistController();
@@ -1040,20 +1036,6 @@ public String rootName() {
     return name;
   }
 
-  /**
-   * Return the named ORM query.
-   */
-  public String namedQuery(String name) {
-    return namedQuery.get(name);
-  }
-
-  /**
-   * Return the named RawSql query.
-   */
-  public SpiRawSql namedRawSql(String named) {
-    return namedRawSql.get(named);
-  }
-
   /**
    * Return the type of DocStoreMode that should occur for this type of persist request
    * given the transactions requested mode.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -2,7 +2,6 @@
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Model;
-import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
@@ -35,10 +34,6 @@
 import io.ebeaninternal.server.properties.BeanPropertyAccess;
 import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmapping.api.XmapEbean;
-import io.ebeaninternal.xmapping.api.XmapEntity;
-import io.ebeaninternal.xmapping.api.XmapNamedQuery;
-import io.ebeaninternal.xmapping.api.XmapRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
 
@@ -284,11 +279,10 @@ public Map<String, String> draftTableMap() {
   /**
    * Deploy returning the asOfTableMap (which is required by the SQL builders).
    */
-  public Map<String, String> deploy(List<XmapEbean> mappings) {
+  public Map<String, String> deploy() {
     try {
       createListeners();
       readEntityDeploymentInitial();
-      readXmlMapping(mappings);
       readEntityBeanTable();
       readEntityDeploymentAssociations();
       readInheritedIdGenerators();
@@ -315,56 +309,6 @@ public Map<String, String> deploy(List<XmapEbean> mappings) {
     }
   }
 
-  private void readXmlMapping(List<XmapEbean> mappings) {
-    if (mappings != null) {
-      ClassLoader classLoader = config.getClassLoadConfig().getClassLoader();
-      for (XmapEbean mapping : mappings) {
-        List<XmapEntity> entityDeploy = mapping.getEntity();
-        for (XmapEntity deploy : entityDeploy) {
-          readEntityMapping(classLoader, deploy);
-        }
-      }
-    }
-  }
-
-  private void readEntityMapping(ClassLoader classLoader, XmapEntity entityDeploy) {
-    String entityClassName = entityDeploy.getClazz();
-    Class<?> entityClass;
-    try {
-      entityClass = Class.forName(entityClassName, false, classLoader);
-    } catch (Exception e) {
-      log.log(ERROR, "Could not load entity bean class " + entityClassName + " for ebean.xml entry");
-      return;
-    }
-
-    DeployBeanInfo<?> info = deployInfoMap.get(entityClass);
-    if (info == null) {
-      log.log(ERROR, "No entity bean for ebean.xml entry " + entityClassName);
-
-    } else {
-      for (XmapRawSql sql : entityDeploy.getRawSql()) {
-        RawSqlBuilder builder;
-        try {
-          builder = RawSqlBuilder.parse(sql.getQuery());
-        } catch (RuntimeException e) {
-          builder = RawSqlBuilder.unparsed(sql.getQuery());
-        }
-
-        for (Map.Entry<String, String> columnMapping : sql.getColumnMapping().entrySet()) {
-          builder.columnMapping(columnMapping.getKey(), columnMapping.getValue());
-        }
-        for (Map.Entry<String, String> aliasMapping : sql.getAliasMapping().entrySet()) {
-          builder.tableAliasMapping(aliasMapping.getKey(), aliasMapping.getValue());
-        }
-        info.addRawSql(sql.getName(), builder.create());
-      }
-
-      for (XmapNamedQuery namedQuery : entityDeploy.getNamedQuery()) {
-        info.addNamedQuery(namedQuery.getName(), namedQuery.getQuery());
-      }
-    }
-  }
-
   /**
    * Return the Encrypt key given the table and column name.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -53,8 +53,6 @@ public int compare(DeployBeanProperty o1, DeployBeanProperty o2) {
    * Map of BeanProperty Linked so as to preserve order.
    */
   private LinkedHashMap<String, DeployBeanProperty> propMap = new LinkedHashMap<>();
-  private Map<String, SpiRawSql> namedRawSql;
-  private Map<String, String> namedQuery;
   private EntityType entityType;
   private DeployBeanPropertyAssocOne<?> unidirectional;
   private DeployBeanProperty orderColumn;
@@ -1025,40 +1023,6 @@ private DocStoreMode getDocStoreIndexEvent(DocStoreMode mostSpecific) {
     return config.getDocStoreConfig().getPersist();
   }
 
-  /**
-   * Return the named ORM queries.
-   */
-  public Map<String, String> getNamedQuery() {
-    return (namedQuery != null) ? namedQuery : EMPTY_NAMED_QUERY;
-  }
-
-  /**
-   * Add a named query.
-   */
-  public void addNamedQuery(String name, String query) {
-    if (namedQuery == null) {
-      namedQuery = new LinkedHashMap<>();
-    }
-    namedQuery.put(name, query);
-  }
-
-  /**
-   * Return the named RawSql queries.
-   */
-  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, SpiRawSql rawSql) {
-    if (namedRawSql == null) {
-      namedRawSql = new HashMap<>();
-    }
-    namedRawSql.put(name, rawSql);
-  }
-
   /**
    * Parse the aggregation formula into expressions with table alias placeholders.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -186,7 +186,7 @@ private void read(Class<?> cls) {
       }
     }
     for (NamedQuery namedQuery : annotationClassNamedQuery(cls)) {
-      descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
+      // TODO: throw new UnsupportedOperationException("NamedQuery not supported");
     }
   }