zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QueryType to persistence module.

Browse Source
This commit is contained in:
KomachiSion 2023-04-23 17:54:21 +08:00
parent 6acabeca67
commit 8dfd31a87d
12 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/BaseDatabaseOperate.java
View File

@ -18,7 +18,7 @@ package com.alibaba.nacos.config.server.service.repository.embedded;
import com.alibaba.nacos.common.utils.ExceptionUtil;
import com.alibaba.nacos.common.utils.LoggerUtils;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import com.alibaba.nacos.config.server.utils.DerbyUtils;
import com.alibaba.nacos.config.server.utils.LogUtil;
import org.springframework.dao.DataAccessException;

2
config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DatabaseOperate.java
View File

@ -18,7 +18,7 @@ package com.alibaba.nacos.config.server.service.repository.embedded;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import org.springframework.jdbc.core.RowMapper;
import java.io.File;

6
config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DistributedDatabaseOperateImpl.java
View File

@ -41,9 +41,9 @@ import com.alibaba.nacos.persistence.datasource.LocalDataSourceServiceImpl;
import com.alibaba.nacos.config.server.service.dump.DumpConfigHandler;
import com.alibaba.nacos.config.server.service.repository.RowMapperManager;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.config.server.service.sql.QueryType;
import com.alibaba.nacos.persistence.repository.embedded.SelectRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.QueryType;
import com.alibaba.nacos.persistence.repository.embedded.sql.SelectRequest;
import com.alibaba.nacos.config.server.utils.ConfigExecutor;
import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.consistency.SerializeFactory;

2
config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImpl.java
View File

@ -23,7 +23,7 @@ import com.alibaba.nacos.common.utils.StringUtils;
import com.alibaba.nacos.config.server.configuration.ConditionStandaloneEmbedStorage;
import com.alibaba.nacos.persistence.datasource.DataSourceService;
import com.alibaba.nacos.persistence.datasource.DynamicDataSource;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.sys.utils.DiskUtils;
import org.springframework.context.annotation.Conditional;

2
config/src/test/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImplTest.java
View File

@ -19,7 +19,7 @@ package com.alibaba.nacos.config.server.service.repository.embedded;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.config.server.model.ConfigInfo;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

2
persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/EmbeddedStorageContextHolder.java
View File

@ -16,6 +16,8 @@
package com.alibaba.nacos.persistence.repository.embedded;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

2
persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/ModifyRequest.java → persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/sql/ModifyRequest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.alibaba.nacos.persistence.repository.embedded;
package com.alibaba.nacos.persistence.repository.embedded.sql;
import java.io.Serializable;
import java.util.Arrays;

4
config/src/main/java/com/alibaba/nacos/config/server/service/sql/QueryType.java → persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/sql/QueryType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
* Copyright 1999-2023 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.alibaba.nacos.config.server.service.sql;
package com.alibaba.nacos.persistence.repository.embedded.sql;
import org.springframework.jdbc.core.RowMapper;

2
persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/SelectRequest.java → persistence/src/main/java/com/alibaba/nacos/persistence/repository/embedded/sql/SelectRequest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.alibaba.nacos.persistence.repository.embedded;
package com.alibaba.nacos.persistence.repository.embedded.sql;
import java.io.Serializable;
import java.util.Arrays;

2
plugin-default-impl/src/test/java/com/alibaba/nacos/plugin/auth/impl/persistence/EmbeddedPermissionPersistServiceImplTest.java
View File

@ -21,7 +21,7 @@ import com.alibaba.nacos.persistence.repository.PaginationHelper;
import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate;
import com.alibaba.nacos.config.server.service.repository.embedded.EmbeddedStoragePersistServiceImpl;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

2
plugin-default-impl/src/test/java/com/alibaba/nacos/plugin/auth/impl/persistence/EmbeddedRolePersistServiceImplTest.java
View File

@ -21,7 +21,7 @@ import com.alibaba.nacos.persistence.repository.PaginationHelper;
import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate;
import com.alibaba.nacos.config.server.service.repository.embedded.EmbeddedStoragePersistServiceImpl;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

2
test/config-test/src/test/java/com/alibaba/nacos/test/config/EmbeddedStorageContextUtils_CITCase.java
View File

@ -17,7 +17,7 @@
package com.alibaba.nacos.test.config;
import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder;
import com.alibaba.nacos.persistence.repository.embedded.ModifyRequest;
import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest;
import com.alibaba.nacos.test.base.ConfigCleanUtils;
import org.junit.AfterClass;
import org.junit.Assert;