chore: 修改名称

Author: cjbi

flexmodel-core/src/main/java/tech/wetech/flexmodel/ModelRegistry.java

@@ -16,42 +16,42 @@ public interface ModelRegistry {
   /**
    * 从数据库中加载模型
    *
-   * @param sqlContext
+   * @param sessionContext
    * @return
    */
-  List<SchemaObject> loadFromDatabase(AbstractSessionContext sqlContext);
+  List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext);
 
   /**
    * 从数据库中加载模型
    *
-   * @param sqlContext
+   * @param sessionContext
    * @param includes
    * @return
    */
-  List<SchemaObject> loadFromDatabase(AbstractSessionContext sqlContext, Set<String> includes);
+  List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext, Set<String> includes);
 
   /**
    * 获取所有已注册的模型
    *
    * @param schemaName
    * @return
    */
-  List<SchemaObject> getAllRegistered(String schemaName);
+  List<SchemaObject> listRegistered(String schemaName);
 
   /**
    * 注销模型
    *
    * @param schemaName
    */
-  void unregister(String schemaName);
+  void unregisterAll(String schemaName);
 
   /**
    * 注销模型
    *
    * @param schemaName
    * @param modelName
    */
-  void unregister(String schemaName, String modelName);
+  void unregisterAll(String schemaName, String modelName);
 
   /**
    * 注册模型

flexmodel-core/src/main/java/tech/wetech/flexmodel/cache/CachingModelRegistry.java

@@ -21,32 +21,32 @@ public CachingModelRegistry(ModelRegistry delegate, Cache cache) {
   }
 
   @Override
-  public List<SchemaObject> loadFromDatabase(AbstractSessionContext context) {
+  public List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext) {
     cache.invalidateAll();
-    return delegate.loadFromDatabase(context);
+    return delegate.loadFromDataSource(sessionContext);
   }
 
   @Override
-  public List<SchemaObject> loadFromDatabase(AbstractSessionContext sqlContext, Set<String> includes) {
+  public List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext, Set<String> includes) {
     cache.invalidateAll();
-    return delegate.loadFromDatabase(sqlContext, includes);
+    return delegate.loadFromDataSource(sessionContext, includes);
   }
 
   @Override
-  public List<SchemaObject> getAllRegistered(String schemaName) {
-    return delegate.getAllRegistered(schemaName);
+  public List<SchemaObject> listRegistered(String schemaName) {
+    return delegate.listRegistered(schemaName);
   }
 
   @Override
-  public void unregister(String schemaName) {
+  public void unregisterAll(String schemaName) {
     cache.invalidateAll();
-    delegate.unregister(schemaName);
+    delegate.unregisterAll(schemaName);
   }
 
   @Override
-  public void unregister(String schemaName, String modelName) {
+  public void unregisterAll(String schemaName, String modelName) {
     cache.invalidate(schemaName + ":" + modelName);
-    delegate.unregister(schemaName, modelName);
+    delegate.unregisterAll(schemaName, modelName);
   }
 
   @Override

flexmodel-core/src/main/java/tech/wetech/flexmodel/cache/InMemoryModelRegistry.java

@@ -14,18 +14,18 @@ public class InMemoryModelRegistry implements ModelRegistry {
   private final Map<String, Map<String, SchemaObject>> map = new HashMap<>();
 
   @Override
-  public List<SchemaObject> loadFromDatabase(AbstractSessionContext context) {
+  public List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext) {
     // ignore
     return Collections.emptyList();
   }
 
   @Override
-  public List<SchemaObject> loadFromDatabase(AbstractSessionContext sqlContext, Set<String> includes) {
+  public List<SchemaObject> loadFromDataSource(AbstractSessionContext sessionContext, Set<String> includes) {
     return Collections.emptyList();
   }
 
   @Override
-  public List<SchemaObject> getAllRegistered(String schemaName) {
+  public List<SchemaObject> listRegistered(String schemaName) {
     List<SchemaObject> result = new ArrayList<>();
 
     // 从内存映射中获取
@@ -38,12 +38,12 @@ public List<SchemaObject> getAllRegistered(String schemaName) {
   }
 
   @Override
-  public void unregister(String schemaName) {
+  public void unregisterAll(String schemaName) {
     map.clear();
   }
 
   @Override
-  public void unregister(String schemaName, String modelName) {
+  public void unregisterAll(String schemaName, String modelName) {
     map.get(schemaName).remove(modelName);
   }
 

flexmodel-core/src/main/java/tech/wetech/flexmodel/mongodb/MongoDataService.java

@@ -49,21 +49,21 @@ private String getCollectionName(String modelName) {
   public int insert(String modelName, Object objR) {
 
     Map<String, Object> data = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), objR, Map.class);
-    Map<String, Object> processedData = generateValue(modelName, data, false);
+    Map<String, Object> processedData = generateFieldValues(modelName, data, false);
 
     try {
       Map<String, Object> record = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), processedData, Map.class);
-      EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+      EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
       TypedField<?, ?> idField = entity.findIdField().orElseThrow();
       if (GeneratedValue.AUTO_INCREMENT.equals(idField.getDefaultValue())) {
-        setId(modelName, record);
+        assignAutoIncrementId(modelName, record);
       }
       String collectionName = getCollectionName(modelName);
       InsertOneResult result = mongoDatabase.getCollection(collectionName, Map.class).insertOne(record);
       return result.wasAcknowledged() ? 1 : 0;
     } finally {
       // 获取生成的ID（如果有的话）
-      EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+      EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
       Optional<TypedField<?, ?>> idFieldOptional = entity.findIdField();
       Object id = null;
       if (idFieldOptional.isPresent()) {
@@ -73,11 +73,11 @@ public int insert(String modelName, Object objR) {
       }
 
       // 处理关联关系
-      insertRelationRecord(modelName, data, id);
+      insertRelatedRecords(modelName, data, id);
     }
   }
 
-  private void setId(String modelName, Map<String, Object> record) {
+  private void assignAutoIncrementId(String modelName, Map<String, Object> record) {
     String sequenceName = modelName + "_seq";
     try {
       schemaService.createSequence(sequenceName, 1, 1);
@@ -93,11 +93,11 @@ private void setId(String modelName, Map<String, Object> record) {
   public int updateById(String modelName, Object objR, Object id) {
 
     Map<String, Object> data = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), objR, Map.class);
-    Map<String, Object> processedData = generateValue(modelName, data, true);
+    Map<String, Object> processedData = generateFieldValues(modelName, data, true);
 
     Map<String, Object> record = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), processedData, Map.class);
     String collectionName = getCollectionName(modelName);
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     TypedField<?, ?> idField = entity.findIdField().orElseThrow();
     UpdateResult result = mongoDatabase.getCollection(collectionName, Map.class).updateOne(Filters.eq(idField.getName(), id), new Document("$set", new Document(record)));
     return (int) result.getModifiedCount();
@@ -107,8 +107,7 @@ public int updateById(String modelName, Object objR, Object id) {
   public int update(String modelName, Object objR, String filter) {
 
     Map<String, Object> data = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), objR, Map.class);
-    Map<String, Object> processedData = generateValue(modelName, data, true);
-
+    Map<String, Object> processedData = generateFieldValues(modelName, data, true);
 
     Map<String, Object> record = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), processedData, Map.class);
     String collectionName = getCollectionName(modelName);
@@ -121,7 +120,7 @@ public int update(String modelName, Object objR, String filter) {
   @Override
   public int deleteById(String modelName, Object id) {
     String collectionName = getCollectionName(modelName);
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     TypedField<?, ?> idField = entity.findIdField().orElseThrow();
     return (int) mongoDatabase.getCollection(collectionName)
       .deleteMany(Filters.eq(idField.getName(), id)).getDeletedCount();
@@ -147,14 +146,14 @@ public int deleteAll(String modelName) {
   @SuppressWarnings({"rawtypes", "unchecked"})
   public <T> T findById(String modelName, Object id, Class<T> resultType, boolean nestedQuery) {
     String collectionName = getCollectionName(modelName);
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     TypedField<?, ?> idField = entity.findIdField().orElseThrow();
 
     Map dataMap = mongoDatabase.getCollection(collectionName, Map.class)
       .find(Filters.eq(idField.getName(), id))
       .first();
     if (nestedQuery && dataMap != null) {
-      nestedQuery(List.of(dataMap), this::findMapList, (ModelDefinition) sessionContext.getModel(modelName),
+      nestedQuery(List.of(dataMap), this::queryAsMapList, (ModelDefinition) sessionContext.getModelDefinition(modelName),
         null, sessionContext.getNestedQueryMaxDepth());
     }
     T result = sessionContext.getJsonObjectConverter().convertValue(dataMap, resultType);
@@ -166,16 +165,16 @@ public <T> T findById(String modelName, Object id, Class<T> resultType, boolean
 
   @Override
   public <T> List<T> find(String modelName, Query query, Class<T> resultType) {
-    List<Map<String, Object>> mapList = findMapList(modelName, query);
+    List<Map<String, Object>> mapList = queryAsMapList(modelName, query);
     if (query.isNestedEnabled()) {
-      nestedQuery(mapList, this::findMapList, (ModelDefinition) sessionContext.getModel(modelName), query, sessionContext.getNestedQueryMaxDepth());
+      nestedQuery(mapList, this::queryAsMapList, (ModelDefinition) sessionContext.getModelDefinition(modelName), query, sessionContext.getNestedQueryMaxDepth());
     }
     List<T> results = sessionContext.getJsonObjectConverter().convertValueList(mapList, resultType);
     return LazyObjProxy.createProxyList(results, modelName, sessionContext);
   }
 
   @Override
-  public <T> List<T> findByNativeQueryStatement(String statement, Object obj, Class<T> resultType) {
+  public <T> List<T> findByNativeStatement(String statement, Object obj, Class<T> resultType) {
     Map<String, Object> params = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), obj, Map.class);
     String json = StringHelper.simpleRenderTemplate(statement, params);
     Document result = mongoDatabase.runCommand(Document.parse(json));
@@ -184,14 +183,14 @@ public <T> List<T> findByNativeQueryStatement(String statement, Object obj, Clas
   }
 
   @Override
-  public <T> List<T> findByNativeQueryModel(String modelName, Object obj, Class<T> resultType) {
+  public <T> List<T> findByNativeQuery(String modelName, Object obj, Class<T> resultType) {
     Map<String, Object> params = ReflectionUtils.toClassBean(sessionContext.getJsonObjectConverter(), obj, Map.class);
-    NativeQueryDefinition model = (NativeQueryDefinition) sessionContext.getModel(modelName);
-    return findByNativeQueryStatement(model.getStatement(), params, resultType);
+    NativeQueryDefinition model = (NativeQueryDefinition) sessionContext.getModelDefinition(modelName);
+    return findByNativeStatement(model.getStatement(), params, resultType);
   }
 
   @SuppressWarnings({"rawtypes"})
-  private List<Map<String, Object>> findMapList(String modelName, Query query) {
+  private List<Map<String, Object>> queryAsMapList(String modelName, Query query) {
     List<Document> pipeline = builder.createPipeline(modelName, query);
 
     String collectionName = getCollectionName(modelName);

flexmodel-core/src/main/java/tech/wetech/flexmodel/mongodb/MongoSchemaService.java

@@ -39,17 +39,17 @@ public MongoSchemaService(MongoContext sessionContext) {
 
   @Override
   public List<SchemaObject> loadModels() {
-    return sessionContext.getModelRegistry().loadFromDatabase(sessionContext);
+    return sessionContext.getModelRegistry().loadFromDataSource(sessionContext);
   }
 
   @Override
   public List<SchemaObject> loadModels(Set<String> modelNames) {
-    return sessionContext.getModelRegistry().loadFromDatabase(sessionContext, modelNames);
+    return sessionContext.getModelRegistry().loadFromDataSource(sessionContext, modelNames);
   }
 
   @Override
-  public List<SchemaObject> getAllModels() {
-    return modelRegistry.getAllRegistered(sessionContext.getSchemaName());
+  public List<SchemaObject> listModels() {
+    return modelRegistry.listRegistered(sessionContext.getSchemaName());
   }
 
   @Override
@@ -61,43 +61,43 @@ public SchemaObject getModel(String modelName) {
   public void dropModel(String modelName) {
     String collectionName = getCollectionName(modelName);
     mongoDatabase.getCollection(collectionName).drop();
-    modelRegistry.unregister(schemaName, modelName);
+    modelRegistry.unregisterAll(schemaName, modelName);
   }
 
   @Override
-  public EntityDefinition createEntity(EntityDefinition collection) {
-    // 保存到ModelRepository中
-    modelRegistry.register(schemaName, collection);
+  public EntityDefinition createEntity(EntityDefinition entity) {
+    // 保存到ModelRegistry中
+    modelRegistry.register(schemaName, entity);
 
-    String collectionName = getCollectionName(collection.getName());
+    String collectionName = getCollectionName(entity.getName());
     mongoDatabase.createCollection(collectionName);
 
     // 创建集合中已定义的索引
-    List<IndexDefinition> indexesToCreate = new ArrayList<>(collection.getIndexes());
+    List<IndexDefinition> indexesToCreate = new ArrayList<>(entity.getIndexes());
     for (IndexDefinition index : indexesToCreate) {
       createIndex(index);
     }
 
     // 为主键字段创建唯一索引
-    collection.findIdField().ifPresent(idField -> {
+    entity.findIdField().ifPresent(idField -> {
       IndexDefinition index = new IndexDefinition(idField.getModelName());
       index.setUnique(true);
       index.addField(idField.getName());
       createIndex(index);
     });
 
-    return collection;
+    return entity;
   }
 
   @Override
-  public NativeQueryDefinition createNativeQueryModel(NativeQueryDefinition model) {
-    modelRegistry.register(schemaName, model);
-    return model;
+  public NativeQueryDefinition createNativeQuery(NativeQueryDefinition nq) {
+    modelRegistry.register(schemaName, nq);
+    return nq;
   }
 
   @Override
   public EnumDefinition createEnum(EnumDefinition anEnum) {
-    // 保存到ModelRepository中
+    // 保存到ModelRegistry中
     modelRegistry.register(schemaName, anEnum);
     return anEnum;
   }
@@ -122,7 +122,7 @@ public EnumDefinition createEnum(EnumDefinition anEnum) {
   @Override
   public TypedField<?, ?> modifyField(TypedField<?, ?> field) {
     // mongodb无需修改schema
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(field.getModelName());
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(field.getModelName());
     entity.removeField(field.getName());
     entity.addField(field);
     modelRegistry.register(schemaName, entity);
@@ -131,7 +131,7 @@ public EnumDefinition createEnum(EnumDefinition anEnum) {
 
   @Override
   public void dropField(String modelName, String fieldName) {
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     entity.removeField(fieldName);
     // 移除相关索引
     for (IndexDefinition index : entity.getIndexes()) {
@@ -161,7 +161,7 @@ public IndexDefinition createIndex(IndexDefinition index) {
     mongoDatabase.getCollection(collectionName).createIndex(Indexes.compoundIndex(indexes), indexOptions);
 
     // 只有在索引不存在时才添加到实体中，避免重复添加
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(index.getModelName());
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(index.getModelName());
     if (entity != null && entity.getIndex(index.getName()) == null) {
       entity.addIndex(index);
       modelRegistry.register(schemaName, entity);
@@ -183,7 +183,7 @@ private String getPhysicalIndexName(IndexDefinition index) {
   public void dropIndex(String modelName, String indexName) {
     String collectionName = getCollectionName(modelName);
     mongoDatabase.getCollection(collectionName).dropIndex(indexName);
-    EntityDefinition entity = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition entity = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     entity.removeIndex(indexName);
     sessionContext.getModelRegistry().register(schemaName, entity);
   }
@@ -200,7 +200,7 @@ public void createSequence(String sequenceName, int initialValue, int incrementS
   }
 
   private String getCollectionName(String modelName) {
-    EntityDefinition model = (EntityDefinition) sessionContext.getModel(modelName);
+    EntityDefinition model = (EntityDefinition) sessionContext.getModelDefinition(modelName);
     if (model == null) {
       return modelName;
     }

flexmodel-core/src/main/java/tech/wetech/flexmodel/mongodb/MongoStatementBuilder.java

@@ -196,7 +196,7 @@ private Document createDatePartAggregation(String fieldName, String operator) {
 
   protected List<Document> createPipeline(String modelName, Query query) {
     validateQuery(modelName, query);
-    ModelDefinition model = (ModelDefinition) mongoContext.getModel(modelName);
+    ModelDefinition model = (ModelDefinition) mongoContext.getModelDefinition(modelName);
     PhysicalNamingStrategy physicalNamingStrategy = mongoContext.getPhysicalNamingStrategy();
     List<Document> pipeline = new ArrayList<>();
     addMatchStage(pipeline, query);