This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new d660d70f5 Convert annotations to mappers (#3941)
d660d70f5 is described below
commit d660d70f581888a9fbbe9403c4a3e375aa43ba08
Author: 成彬彬 <[email protected]>
AuthorDate: Sat Dec 3 23:13:39 2022 +0800
Convert annotations to mappers (#3941)
---
.../errorcode/server/dao/ErrorCodeMapper.java | 11 -------
.../errorcode/server/dao/impl/ErrorCodeMapper.xml | 28 +++++++++++++++++
.../errorcode/server/dao/ErrorCodeMapperTest.java} | 30 +++++++++----------
.../common/lock/dao/CommonLockMapper.java | 12 ++------
.../common/lock/dao/impl/CommonLockMapper.xml | 35 ++++++++++++++++++++++
.../common/lock/dao/CommonLockMapperTest.java | 1 -
.../src/test/resources/application.properties | 4 +--
7 files changed, 82 insertions(+), 39 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
index 1858998d4..9c2812362 100644
---
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
+++
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
@@ -20,21 +20,10 @@ package org.apache.linkis.errorcode.server.dao;
import org.apache.linkis.errorcode.common.LinkisErrorCode;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface ErrorCodeMapper {
-
- @Select("SELECT * FROM linkis_ps_error_code")
- @Results({
- @Result(property = "errorCode", column = "error_code"),
- @Result(property = "errorDesc", column = "error_desc"),
- @Result(property = "errorRegexStr", column = "error_regex"),
- @Result(property = "errorType", column = "error_type"),
- })
List<LinkisErrorCode> getAllErrorCodes();
}
diff --git
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
new file mode 100644
index 000000000..696bee645
--- /dev/null
+++
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
+
+<mapper namespace="org.apache.linkis.errorcode.server.dao.ErrorCodeMapper">
+
+ <select id="getAllErrorCodes"
+ resultType="org.apache.linkis.errorcode.common.LinkisErrorCode">
+ SELECT * FROM linkis_ps_error_code
+ </select>
+
+</mapper>
diff --git
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
similarity index 61%
copy from
linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
copy to
linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
index 1858998d4..39d9d9b9f 100644
---
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
+++
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
@@ -19,22 +19,22 @@ package org.apache.linkis.errorcode.server.dao;
import org.apache.linkis.errorcode.common.LinkisErrorCode;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
-@Mapper
-public interface ErrorCodeMapper {
-
- @Select("SELECT * FROM linkis_ps_error_code")
- @Results({
- @Result(property = "errorCode", column = "error_code"),
- @Result(property = "errorDesc", column = "error_desc"),
- @Result(property = "errorRegexStr", column = "error_regex"),
- @Result(property = "errorType", column = "error_type"),
- })
- List<LinkisErrorCode> getAllErrorCodes();
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class ErrorCodeMapperTest extends BaseDaoTest {
+
+ @Autowired private ErrorCodeMapper errorCodeMapper;
+
+ @Test
+ @DisplayName("getAllErrorCodes")
+ public void getAllErrorCodesTest() {
+ List<LinkisErrorCode> list = errorCodeMapper.getAllErrorCodes();
+ Assertions.assertTrue(list.size() == 2);
+ }
}
diff --git
a/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
index eaf65db15..6fb435ab6 100644
---
a/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
+++
b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
@@ -25,18 +25,10 @@ import java.util.List;
@Mapper
public interface CommonLockMapper {
- @Insert(
- "insert into linkis_ps_common_lock (lock_object, time_out, update_time,
create_time)"
- + "values(#{jsonObject}, #{timeOut}, now(), now())")
+
void lock(@Param("jsonObject") String jsonObject, @Param("timeOut") Long
timeOut);
- @Delete("delete from linkis_ps_common_lock where lock_object =
#{jsonObject}")
- void unlock(String jsonObject);
+ void unlock(@Param("jsonObject") String jsonObject);
- @Select("select * from linkis_ps_common_lock")
- @Results({
- @Result(property = "updateTime", column = "update_time"),
- @Result(property = "createTime", column = "create_time")
- })
List<CommonLock> getAll();
}
diff --git
a/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/impl/CommonLockMapper.xml
b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/impl/CommonLockMapper.xml
new file mode 100644
index 000000000..dddb5ebfd
--- /dev/null
+++
b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/impl/CommonLockMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
+
+<mapper
namespace="org.apache.linkis.publicservice.common.lock.dao.CommonLockMapper">
+
+ <insert id="lock">
+ insert into linkis_ps_common_lock (lock_object, time_out, update_time,
create_time)
+ values(#{jsonObject}, #{timeOut}, now(), now())
+ </insert>
+
+ <delete id="unlock">
+ delete from linkis_ps_common_lock where lock_object = #{jsonObject}
+ </delete>
+
+ <select id="getAll"
resultType="org.apache.linkis.publicservice.common.lock.entity.CommonLock">
+ select * from linkis_ps_common_lock
+ </select>
+</mapper>
diff --git
a/linkis-public-enhancements/linkis-ps-common-lock/src/test/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapperTest.java
b/linkis-public-enhancements/linkis-ps-common-lock/src/test/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapperTest.java
index a1b2b1c51..860ea76a7 100644
---
a/linkis-public-enhancements/linkis-ps-common-lock/src/test/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapperTest.java
+++
b/linkis-public-enhancements/linkis-ps-common-lock/src/test/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapperTest.java
@@ -34,7 +34,6 @@ public class CommonLockMapperTest extends BaseDaoTest {
@Test
@DisplayName("getAll")
public void getAllTest() {
-
List<CommonLock> locks = commonLockMapper.getAll();
Assertions.assertTrue(locks.size() == 1);
}
diff --git
a/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
b/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
index df58ee9f8..6286bf0e4 100644
---
a/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
+++
b/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
@@ -56,6 +56,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/variable/dao/impl/*.xml
-mybatis-plus.type-aliases-package=org.apache.linkis.variable.entity
+mybatis-plus.mapper-locations=classpath:org/apache/linkis/publicservice/common/lock/dao/impl/*.xml
+mybatis-plus.type-aliases-package=org/apache/linkis/publicservice/common/lock/entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
