From c4bfa48b59c1e890a0df9f551e471960eb5ec011 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 28 Aug 2023 22:21:34 +1200
Subject: [PATCH] [15x] Remove Named DTO queries and External Mapping (loading
 named queries)

---
 .../src/main/java/io/ebean/Database.java      | 12 ----
 ebean-core/pom.xml                            |  5 --
 .../java/io/ebeaninternal/api/SpiQuery.java   |  5 --
 .../server/core/DefaultServer.java            | 11 ---
 .../server/core/InternalConfigXmlMap.java     | 69 -------------------
 .../server/core/InternalConfiguration.java    | 20 +-----
 .../server/deploy/BeanDescriptor.java         | 18 -----
 .../server/deploy/BeanDescriptorManager.java  | 58 +---------------
 .../deploy/meta/DeployBeanDescriptor.java     | 36 ----------
 .../server/deploy/parse/AnnotationClass.java  |  2 +-
 .../server/deploy/parse/DeployBeanInfo.java   | 16 -----
 .../server/dto/DtoBeanDescriptor.java         | 11 +--
 .../server/dto/DtoBeanManager.java            | 11 +--
 .../server/dto/DtoNamedQueries.java           | 23 -------
 .../server/querydefn/DefaultOrmQuery.java     |  7 --
 ebean-core/src/main/java/module-info.java     |  2 -
 .../xtest/internal/api/TDSpiEbeanServer.java  |  5 --
 .../ebean/xtest/internal/api/TDSpiServer.java |  5 --
 18 files changed, 7 insertions(+), 309 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java

diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 4d52b3f29..59ab76a4a 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -395,18 +395,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.
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f72162ac0..96c14d092 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -49,11 +49,6 @@
       <version>13.23.0-jakarta</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.18.0</version>
-    </dependency>
 
     <!--
     Class retention Nonnull and Nullable annotations
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 4ac3823ad..ef1e5facc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -790,11 +790,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   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.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index d9bf006a8..907bb14a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -863,16 +863,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     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);
@@ -936,7 +926,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       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
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
deleted file mode 100644
index c55467ce4..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.api.CoreLog;
-import io.ebeaninternal.server.dto.DtoNamedQueries;
-import io.ebeaninternal.xmapping.api.XmapDto;
-import io.ebeaninternal.xmapping.api.XmapEbean;
-import io.ebeaninternal.xmapping.api.XmapRawSql;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.lang.System.Logger.Level.ERROR;
-
-/**
- * Reads the Xml deployment information.
- */
-final class InternalConfigXmlMap {
-
-  private final List<XmapEbean> xmlEbeanList;
-  private final ClassLoader classLoader;
-  private final Map<Class<?>, DtoNamedQueries> dtoNamedQueries = new HashMap<>();
-
-  InternalConfigXmlMap(List<XmapEbean> xmlEbeanList, ClassLoader classLoader) {
-    this.xmlEbeanList = xmlEbeanList;
-    this.classLoader = classLoader;
-    initDtoMapping();
-  }
-
-  void initDtoMapping() {
-    if (xmlEbeanList != null) {
-      for (XmapEbean mapping : xmlEbeanList) {
-        List<XmapDto> dtoList = mapping.getDto();
-        for (XmapDto dto : dtoList) {
-          readDtoMapping(dto);
-        }
-      }
-    }
-  }
-
-  /**
-   * Return the XML deployment information for entity beans.
-   */
-  List<XmapEbean> xmlDeployment() {
-    return xmlEbeanList;
-  }
-
-  /**
-   * Return the named queries for Dto beans.
-   */
-  Map<Class<?>, DtoNamedQueries> readDtoMapping() {
-    return dtoNamedQueries;
-  }
-
-  private void readDtoMapping(XmapDto dto) {
-    Class<?> dtoClass;
-    try {
-      dtoClass = Class.forName(dto.getClazz(), false, classLoader);
-    } catch (Exception e) {
-      CoreLog.internal.log(ERROR, "Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
-      return;
-    }
-    DtoNamedQueries namedQueries = dtoNamedQueries.computeIfAbsent(dtoClass, aClass -> new DtoNamedQueries());
-    for (XmapRawSql sql : dto.getRawSql()) {
-      namedQueries.addRawSql(sql.getName(), sql.getQuery());
-    }
-  }
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 080d95560..ea00e6440 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -50,8 +50,6 @@ import io.ebeaninternal.server.json.DJsonContext;
 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 final class InternalConfiguration {
     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 @@ public final class InternalConfiguration {
     }
   }
 
-  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);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index f6f927a64..540a2e96f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -89,8 +89,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   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 class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     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 class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     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.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index c6f50d9dd..0159afbd3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.deploy;
 
 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.BeanPropertiesReader;
 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 final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   /**
    * 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 final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
-  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.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 6aa5186b7..c42c8ff72 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -53,8 +53,6 @@ public class DeployBeanDescriptor<T> {
    * 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 @@ public class DeployBeanDescriptor<T> {
     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.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index a1087c402..6bb7d0003 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -186,7 +186,7 @@ final class AnnotationClass extends AnnotationParser {
       }
     }
     for (NamedQuery namedQuery : annotationClassNamedQuery(cls)) {
-      descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
+      // TODO: throw new UnsupportedOperationException("NamedQuery not supported");
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index 70a7e666a..fc3be531a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -1,10 +1,8 @@
 package io.ebeaninternal.server.deploy.parse;
 
-import io.ebean.RawSql;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
-import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 /**
  * Wraps information about a bean during deployment parsing.
@@ -42,20 +40,6 @@ public final class DeployBeanInfo<T> {
     return util;
   }
 
-  /**
-   * Add named RawSql from ebean.xml.
-   */
-  public void addRawSql(String name, RawSql rawSql) {
-    descriptor.addRawSql(name, (SpiRawSql)rawSql);
-  }
-
-  /**
-   * Add the named query.
-   */
-  public void addNamedQuery(String name, String query) {
-    descriptor.addNamedQuery(name, query);
-  }
-
   /**
    * Set that the PK is also a foreign key.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index c9720308a..107912c07 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -13,12 +13,10 @@ public final class DtoBeanDescriptor<T> {
   private final Map<Object, DtoQueryPlan> plans = new ConcurrentHashMap<>();
   private final Class<T> dtoType;
   private final DtoMeta meta;
-  private final Map<String, String> namedQueries;
 
-  DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta, Map<String, String> namedQueries) {
+  DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta) {
     this.dtoType = dtoType;
     this.meta = meta;
-    this.namedQueries = namedQueries;
   }
 
   public Class<T> type() {
@@ -43,11 +41,4 @@ public final class DtoBeanDescriptor<T> {
     }
   }
 
-  /**
-   * Return the named RawSql query.
-   */
-  public String namedRawSql(String name) {
-    return namedQueries.get(name);
-  }
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
index c95ad1176..bb5a13a1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -16,12 +16,10 @@ public final class DtoBeanManager {
   private static final Map<String,String> EMPTY_NAMED_QUERIES = new HashMap<>();
 
   private final TypeManager typeManager;
-  private final Map<Class<?>, DtoNamedQueries> namedQueries;
   private final Map<Class, DtoBeanDescriptor> descriptorMap = new ConcurrentHashMap<>();
 
-  public DtoBeanManager(TypeManager typeManager, Map<Class<?>, DtoNamedQueries> namedQueries) {
+  public DtoBeanManager(TypeManager typeManager) {
     this.typeManager = typeManager;
-    this.namedQueries = namedQueries;
   }
 
   /**
@@ -35,17 +33,12 @@ public final class DtoBeanManager {
   private <T> DtoBeanDescriptor createDescriptor(Class<T> dtoType) {
     try {
       DtoMeta meta = new DtoMetaBuilder(dtoType, typeManager).build();
-      return new DtoBeanDescriptor<>(dtoType, meta, namedQueries(dtoType));
+      return new DtoBeanDescriptor<>(dtoType, meta);
     } catch (Exception e) {
       throw new IllegalStateException(e);
     }
   }
 
-  private <T> Map<String, String> namedQueries(Class<T> dtoType) {
-    DtoNamedQueries namedQueries = this.namedQueries.get(dtoType);
-    return (namedQueries == null) ? EMPTY_NAMED_QUERIES : namedQueries.map();
-  }
-
   public void visitMetrics(MetricVisitor visitor) {
     for (DtoBeanDescriptor value : descriptorMap.values()) {
       value.visit(visitor);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java
deleted file mode 100644
index 6e92b010a..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.ebeaninternal.server.dto;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Collection of named queries for a single Dto bean type.
- */
-public final class DtoNamedQueries {
-
-  private final Map<String, String> namedRawSql = new HashMap<>();
-
-  /**
-   * Add the named query from deployment XML.
-   */
-  public void addRawSql(String name, String query) {
-    namedRawSql.put(name, query);
-  }
-
-  Map<String, String> map() {
-    return namedRawSql;
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index cdd9de3f3..273ee5591 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -857,13 +857,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return autoTune;
   }
 
-  @Override
-  public final void setDefaultRawSqlIfRequired() {
-    if (beanDescriptor.isRawSqlBased() && rawSql == null) {
-      rawSql = beanDescriptor.namedRawSql(DEFAULT_QUERY_NAME);
-    }
-  }
-
   @Override
   public final Query<T> setAutoTune(boolean autoTune) {
     this.autoTune = autoTune;
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 1b2b35293..05d9bf9f6 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -16,13 +16,11 @@ module io.ebean.core {
   uses io.ebeaninternal.api.SpiLoggerFactory;
   uses io.ebeaninternal.api.GeoTypeProvider;
   uses io.ebeaninternal.api.SpiDdlGeneratorProvider;
-  uses io.ebeaninternal.xmapping.api.XmapService;
   uses io.ebeaninternal.server.autotune.AutoTuneServiceProvider;
   uses io.ebeaninternal.server.cluster.ClusterBroadcastFactory;
 
   requires transitive io.ebean.api;
   requires transitive io.ebean.migration.auto;
-  requires transitive io.ebean.xmapping.api;
   requires transitive io.ebean.core.type;
   requires transitive io.ebean.ddl.runner;
   requires io.avaje.classpath.scanner.api;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
index 3e27048f5..5cbca9a83 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
@@ -431,11 +431,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
-    return null;
-  }
-
   @Override
   public <D> DtoQuery<D> findDto(Class<D> dtoType, SpiQuery<?> ormQuery) {
     return null;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
index 330c854fe..86ee45c1c 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
@@ -152,11 +152,6 @@ public class TDSpiServer implements SpiServer {
     return null;
   }
 
-  @Override
-  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
-    return null;
-  }
-
   @Override
   public SqlQuery sqlQuery(String sql) {
     return null;