admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: code format.

Browse Source
This commit is contained in:
Suomm 2023-07-14 16:14:45 +08:00
parent 8b621fbdc9
commit f03ad784c9
269 changed files with 3427 additions and 2448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/EnumValue.java
View File

@ -24,4 +24,5 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
public @interface EnumValue {
}

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/Generator.java
View File

@ -107,7 +107,7 @@ public class Generator {
buildPrimaryKey(table);
dialect.buildTableColumns(schemaName,table, globalConfig, dbMeta, conn);
dialect.buildTableColumns(schemaName, table, globalConfig, dbMeta, conn);
tables.add(table);
}

12
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/IDialect.java
View File

@ -70,18 +70,18 @@ public interface IDialect {
@Override
protected ResultSet forRemarks(String schema, Table table, DatabaseMetaData dbMeta, Connection conn) throws SQLException {
if (conn instanceof OracleConnection){
if (conn instanceof OracleConnection) {
((OracleConnection) conn).setRemarksReporting(true);
return dbMeta.getColumns(conn.getCatalog(), StringUtil.isNotBlank(schema) ? schema : dbMeta.getUserName(), table.getName(), null);
}else if ("com.zaxxer.hikari.pool.HikariProxyConnection".equals(conn.getClass().getName())){
return forRemarks(schema,table,dbMeta,getOriginalConn(HikariProxyConnection.class,"delegate",conn));
}else if ("com.alibaba.druid.pool.DruidPooledConnection".equals(conn.getClass().getName())){
return forRemarks(schema,table,dbMeta,getOriginalConn(DruidPooledConnection.class,"conn",conn));
} else if ("com.zaxxer.hikari.pool.HikariProxyConnection".equals(conn.getClass().getName())) {
return forRemarks(schema, table, dbMeta, getOriginalConn(HikariProxyConnection.class, "delegate", conn));
} else if ("com.alibaba.druid.pool.DruidPooledConnection".equals(conn.getClass().getName())) {
return forRemarks(schema, table, dbMeta, getOriginalConn(DruidPooledConnection.class, "conn", conn));
}
return null;
}
private Connection getOriginalConn(Class<?> clazz,String attr,Connection conn){
private Connection getOriginalConn(Class<?> clazz, String attr, Connection conn) {
Field delegate = ClassUtil.getFirstField(clazz, field -> field.getName().equals(attr));
try {
delegate.setAccessible(true);

7
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/JdbcDialect.java
View File

@ -30,7 +30,7 @@ public abstract class JdbcDialect implements IDialect {
@Override
public void buildTableColumns(String schemaName, Table table, GlobalConfig globalConfig, DatabaseMetaData dbMeta, Connection conn) throws SQLException {
Map<String, String> columnRemarks = buildColumnRemarks(schemaName,table, dbMeta, conn);
Map<String, String> columnRemarks = buildColumnRemarks(schemaName, table, dbMeta, conn);
String sql = forBuildColumnsSql(table.getSchema(), table.getName());
try (Statement stm = conn.createStatement(); ResultSet rs = stm.executeQuery(sql)) {
@ -58,7 +58,7 @@ public abstract class JdbcDialect implements IDialect {
private Map<String, String> buildColumnRemarks(String schemaName, Table table, DatabaseMetaData dbMeta, Connection conn) {
Map<String, String> columnRemarks = new HashMap<>();
try (ResultSet colRs = forRemarks(schemaName,table, dbMeta, conn)) {
try (ResultSet colRs = forRemarks(schemaName, table, dbMeta, conn)) {
while (colRs.next()) {
columnRemarks.put(colRs.getString("COLUMN_NAME"), colRs.getString("REMARKS"));
}
@ -99,7 +99,4 @@ public abstract class JdbcDialect implements IDialect {
}
}

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
View File

@ -47,7 +47,7 @@ public class TableDefGenerator implements IGenerator {
@Override
public void generate(Table table, GlobalConfig globalConfig) {
if (!globalConfig.isTableDefGenerateEnable()){
if (!globalConfig.isTableDefGenerateEnable()) {
return;
}

18
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/BaseEntity.java
View File

@ -1,8 +1,25 @@
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
*/
package com.mybatisflex.codegen.test;
import java.util.Date;
public class BaseEntity {
private Date createTime;
public Date getCreateTime() {
@ -12,4 +29,5 @@ public class BaseEntity {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}

2
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java
View File

@ -148,7 +148,7 @@ public class GeneratorTest {
generator.generate();
}
// @Test
// @Test
public void testCodeGen3() {
//配置数据源
HikariDataSource dataSource = new HikariDataSource();

17
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/MyBaseMapper.java
View File

@ -1,6 +1,23 @@
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
*/
package com.mybatisflex.codegen.test;
import com.mybatisflex.core.BaseMapper;
public interface MyBaseMapper<T> extends BaseMapper<T> {
}

18
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/MyUpdateListener.java
View File

@ -1,10 +1,28 @@
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
*/
package com.mybatisflex.codegen.test;
import com.mybatisflex.annotation.UpdateListener;
public class MyUpdateListener implements UpdateListener {
@Override
public void onUpdate(Object entity) {
}
}

5
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/SqliteGeneratorTest.java
View File

@ -17,11 +17,9 @@
package com.mybatisflex.codegen.test;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.mybatisflex.codegen.Generator;
import com.mybatisflex.codegen.config.GlobalConfig;
import com.mybatisflex.codegen.dialect.IDialect;
import org.junit.Test;
import javax.sql.DataSource;
import java.sql.Connection;
@ -29,7 +27,7 @@ import java.sql.Statement;
public class SqliteGeneratorTest {
// @Test
// @Test
public void testGenerator3() {
//配置数据源
@ -85,4 +83,5 @@ public class SqliteGeneratorTest {
e.printStackTrace();
}
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
View File

@ -20,7 +20,8 @@ package com.mybatisflex.core;
*/
public class FlexConsts {
private FlexConsts() {}
private FlexConsts() {
}
public static final String NAME = "MyBatis-Flex";
public static final String VERSION = "1.4.9";
@ -57,4 +58,5 @@ public class FlexConsts {
* 当 entity 使用逻辑删除时，1 为 entity 的删除状态
*/
public static final int LOGIC_DELETE_DELETED = 1;
}

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -23,7 +23,10 @@ import com.mybatisflex.core.dialect.DbType;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSessionFactory;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@ -317,6 +320,7 @@ public class FlexGlobalConfig {
* 对应的是 注解 {@link com.mybatisflex.annotation.Id} 的配置
*/
public static class KeyConfig {
private KeyType keyType;
private String value;
private boolean before = true;
@ -344,6 +348,7 @@ public class FlexGlobalConfig {
public void setBefore(boolean before) {
this.before = before;
}
}
@ -399,4 +404,5 @@ public class FlexGlobalConfig {
globalConfigs.put(id, config);
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/MybatisFlexBootstrap.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -241,4 +241,5 @@ public class MybatisFlexBootstrap {
this.logImpl = logImpl;
return this;
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AuditManager.java
View File

@ -151,7 +151,9 @@ public class AuditManager {
@FunctionalInterface
public interface AuditRunnable<T> {
T execute() throws SQLException;
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AuditMessage.java
View File

@ -25,7 +25,10 @@ import java.lang.reflect.Proxy;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* SQL 审计详细消息。

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/Clock.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/ConsoleMessageCollector.java
View File

@ -39,6 +39,9 @@ public class ConsoleMessageCollector implements MessageCollector {
}
public interface SqlDebugPrinter {
void print(String sql, Long tookTimeMillis);
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/MessageCollector.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -19,5 +19,7 @@ package com.mybatisflex.core.audit;
* 审计消息收集器
*/
public interface MessageCollector {
void collect(AuditMessage message);
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/MessageFactory.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/ScheduledMessageCollector.java
View File

@ -81,4 +81,5 @@ public class ScheduledMessageCollector implements MessageCollector, Runnable {
run(); //clear the messages
scheduler.shutdown();
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/http/HttpMessageReporter.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -41,7 +41,9 @@ public class HttpMessageReporter implements MessageReporter {
}
public interface JSONFormatter {
String toJSONString(Object object);
}
}

7
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/http/HttpUtil.java
View File

@ -38,7 +38,8 @@ import java.util.Map.Entry;
*/
public class HttpUtil {
private HttpUtil() {}
private HttpUtil() {
}
private static final String POST = "POST";
@ -74,16 +75,19 @@ public class HttpUtil {
* https 域名校验
*/
private static class TrustAnyHostnameVerifier implements HostnameVerifier {
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
}
}
/**
* https 证书管理
*/
private static class TrustAnyTrustManager implements X509TrustManager {
@Override
public X509Certificate[] getAcceptedIssuers() {
return null;
@ -96,6 +100,7 @@ public class HttpUtil {
@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/AbstractDataSource.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -58,7 +58,6 @@ public abstract class AbstractDataSource implements DataSource {
}
@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> iface) throws SQLException {
@ -75,7 +74,6 @@ public abstract class AbstractDataSource implements DataSource {
}
@Override
public Logger getParentLogger() {
return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceBuilder.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -138,4 +138,5 @@ public class DataSourceBuilder {
return null;
}
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceKey.java
View File

@ -19,7 +19,8 @@ import java.util.function.Supplier;
public class DataSourceKey {
private DataSourceKey() {}
private DataSourceKey() {
}
private static final ThreadLocal<String> keyThreadLocal = new ThreadLocal<>();

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -188,6 +188,7 @@ public class FlexDataSource extends AbstractDataSource {
}
private static class ConnectionHandler implements InvocationHandler {
private static final String[] proxyMethods = new String[]{"commit", "rollback", "close", "setAutoCommit"};
private final Connection original;
private final String xid;
@ -219,6 +220,7 @@ public class FlexDataSource extends AbstractDataSource {
private boolean isTransactional() {
return Objects.equals(xid, TransactionContext.getXID());
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DbTypeUtil.java
View File

@ -160,7 +160,7 @@ public class DbTypeUtil {
return DbType.TDENGINE;
} else if (jdbcUrl.contains(":informix")) {
return DbType.INFORMIX;
}else if (jdbcUrl.contains(":sinodb")) {
} else if (jdbcUrl.contains(":sinodb")) {
return DbType.SINODB;
} else if (jdbcUrl.contains(":uxdb:")) {
return DbType.UXDB;
@ -180,4 +180,5 @@ public class DbTypeUtil {
}
return Pattern.compile(regex).matcher(jdbcUrl).find();
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DialectFactory.java
View File

@ -30,7 +30,8 @@ import java.util.Map;
*/
public class DialectFactory {
private DialectFactory() {}
private DialectFactory() {
}
/**
* 数据库类型和方言的映射关系，可以通过其读取指定的方言，亦可能通过其扩展其他方言
@ -146,4 +147,5 @@ public class DialectFactory {
return new CommonsDialectImpl();
}
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java
View File

@ -15,7 +15,10 @@
*/
package com.mybatisflex.core.dialect;
import com.mybatisflex.core.query.*;
import com.mybatisflex.core.query.CPI;
import com.mybatisflex.core.query.QueryOrderBy;
import com.mybatisflex.core.query.QueryTable;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.util.CollectionUtil;
import java.util.List;

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/OracleDialect.java
View File

@ -178,4 +178,5 @@ public class OracleDialect extends CommonsDialectImpl {
return sql.append(INSERT_ALL_END).toString();
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/FlexExceptions.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -97,4 +97,5 @@ public final class FlexExceptions {
}
}
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/MybatisFlexException.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQuery.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -39,4 +39,5 @@ public class FieldQuery implements Serializable {
public void setQueryWrapper(QueryWrapper queryWrapper) {
this.queryWrapper = queryWrapper;
}
}

9
mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryBuilder.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -29,16 +29,16 @@ public class FieldQueryBuilder<T> implements Serializable {
this.entity = entity;
}
public FieldQueryBuilder<T> field(String field){
public FieldQueryBuilder<T> field(String field) {
fieldQuery.setField(field);
return this;
}
public FieldQueryBuilder<T> field(LambdaGetter<T> fn){
public FieldQueryBuilder<T> field(LambdaGetter<T> fn) {
return field(LambdaUtil.getFieldName(fn));
}
public FieldQueryBuilder<T> queryWrapper(QueryBuilder<T> fun){
public FieldQueryBuilder<T> queryWrapper(QueryBuilder<T> fun) {
fieldQuery.setQueryWrapper(fun.build(entity));
return this;
}
@ -46,4 +46,5 @@ public class FieldQueryBuilder<T> implements Serializable {
public FieldQuery build() {
return fieldQuery;
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/field/QueryBuilder.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -18,5 +18,7 @@ package com.mybatisflex.core.field;
import com.mybatisflex.core.query.QueryWrapper;
public interface QueryBuilder<T> {
QueryWrapper build(T entity);
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/BaseJsonTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -52,4 +52,5 @@ public abstract class BaseJsonTypeHandler<T> extends BaseTypeHandler<T> {
protected abstract T parseJson(String json);
protected abstract String toJson(T object);
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/CompositeEnumTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -60,4 +60,5 @@ public class CompositeEnumTypeHandler<E extends Enum<E>> implements TypeHandler<
public E getResult(CallableStatement cs, int columnIndex) throws SQLException {
return delegate.getResult(cs, columnIndex);
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/Fastjson2TypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -39,4 +39,5 @@ public class Fastjson2TypeHandler extends BaseJsonTypeHandler<Object> {
, JSONWriter.Feature.WriteNullStringAsEmpty
);
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FastjsonTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -36,4 +36,5 @@ public class FastjsonTypeHandler extends BaseJsonTypeHandler<Object> {
return JSON.toJSONString(object, SerializerFeature.WriteMapNullValue,
SerializerFeature.WriteNullListAsEmpty, SerializerFeature.WriteNullStringAsEmpty);
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/GsonTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -47,4 +47,5 @@ public class GsonTypeHandler extends BaseJsonTypeHandler<Object> {
public static void setGson(Gson gson) {
GsonTypeHandler.gson = gson;
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/JacksonTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -58,4 +58,5 @@ public class JacksonTypeHandler extends BaseJsonTypeHandler<Object> {
public static void setObjectMapper(ObjectMapper objectMapper) {
JacksonTypeHandler.objectMapper = objectMapper;
}
}

7
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/CustomKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -73,10 +73,10 @@ public class CustomKeyGenerator implements KeyGenerator {
MetaObject metaParam = configuration.newMetaObject(parameter);
Object generateId = keyGenerator.generate(entity, idInfo.getColumn());
try {
MetaObject metaObjectForProperty= metaParam.metaObjectForProperty(FlexConsts.ENTITY);
MetaObject metaObjectForProperty = metaParam.metaObjectForProperty(FlexConsts.ENTITY);
Invoker setInvoker = tableInfo.getReflector().getSetInvoker(idInfo.getProperty());
Object id = ConvertUtil.convert(generateId, setInvoker.getType());
this.setValue(metaObjectForProperty,this.idInfo.getProperty(),id);
this.setValue(metaObjectForProperty, this.idInfo.getProperty(), id);
} catch (Exception e) {
throw FlexExceptions.wrap(e);
}
@ -95,4 +95,5 @@ public class CustomKeyGenerator implements KeyGenerator {
metaParam.setValue(property, value);
}
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/IMultiKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -30,4 +30,5 @@ public interface IMultiKeyGenerator {
* @return 列名数组
*/
String[] getKeyColumnNames();
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/KeyGeneratorFactory.java
View File

@ -24,7 +24,8 @@ import java.util.Map;
public class KeyGeneratorFactory {
private KeyGeneratorFactory() {}
private KeyGeneratorFactory() {
}
private static final Map<String, IKeyGenerator> KEY_GENERATOR_MAP = new HashMap<>();

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/KeyGenerators.java
View File

@ -17,7 +17,8 @@ package com.mybatisflex.core.keygen;
public class KeyGenerators {
private KeyGenerators() {}
private KeyGenerators() {
}
/**
* uuid 主键生成器
@ -36,4 +37,5 @@ public class KeyGenerators {
* {@link com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator}
*/
public static final String snowFlakeId = "snowFlakeId";
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/MultiEntityKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -54,4 +54,5 @@ public class MultiEntityKeyGenerator implements KeyGenerator {
// 多条数据批量插入的场景下，不支持后设置主键
// 比如 INSERT INTO `tb_account`(uuid,name,sex) VALUES (?, ?, ?), (?, ?, ?)
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/MultiRowKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -55,4 +55,5 @@ public class MultiRowKeyGenerator implements KeyGenerator {
// 多条数据批量插入的场景下，不支持后设置主键
// 比如 INSERT INTO `tb_account`(uuid,name,sex) VALUES (?, ?, ?), (?, ?, ?)
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/MybatisKeyGeneratorUtil.java
View File

@ -35,7 +35,8 @@ import java.util.List;
public class MybatisKeyGeneratorUtil {
private MybatisKeyGeneratorUtil() {}
private MybatisKeyGeneratorUtil() {
}
public static KeyGenerator createTableKeyGenerator(TableInfo tableInfo, MappedStatement ms) {
List<IdInfo> primaryKeyList = tableInfo.getPrimaryKeyList();

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/RowCustomKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -68,4 +68,5 @@ public class RowCustomKeyGenerator implements KeyGenerator {
public void processAfter(Executor executor, MappedStatement ms, Statement stmt, Object parameter) {
//do nothing
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/RowJdbc3KeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -219,6 +219,7 @@ public class RowJdbc3KeyGenerator implements KeyGenerator {
}
private class KeyAssigner {
private final Configuration configuration;
private final ResultSetMetaData rsmd;
private final TypeHandlerRegistry typeHandlerRegistry;
@ -266,5 +267,7 @@ public class RowJdbc3KeyGenerator implements KeyGenerator {
e);
}
}
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/RowKeyGenerator.java
View File

@ -40,6 +40,7 @@ import java.util.Map;
* 为 row 的主键生成器
*/
public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
private static final KeyGenerator[] NO_KEY_GENERATORS = new KeyGenerator[0];
private final MappedStatement ms;
@ -153,4 +154,5 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
public String[] getKeyColumnNames() {
return autoKeyGeneratorNames.toArray(new String[0]);
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/impl/SnowFlakeIDKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/impl/UUIDKeyGenerator.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -25,4 +25,5 @@ public class UUIDKeyGenerator implements IKeyGenerator {
public Object generate(Object entity, String keyColumn) {
return UUID.randomUUID().toString().replace("-", "");
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/logicdelete/LogicDeleteProcessor.java
View File

@ -26,6 +26,7 @@ public interface LogicDeleteProcessor {
/**
* 用户构建查询正常数据的条件。
*
* @param logicColumn 逻辑删除列
* @param tableInfo
* @param dialect 数据库方言
@ -34,6 +35,7 @@ public interface LogicDeleteProcessor {
/**
* 用户与构建删除数据时的内容。
*
* @param logicColumn 逻辑删除列
* @param tableInfo
* @param dialect 数据库方言

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/mask/MaskManager.java
View File

@ -24,7 +24,8 @@ import java.util.function.Supplier;
*/
public class MaskManager {
private MaskManager() {}
private MaskManager() {
}
/**
* 脱敏处理器，type : processor

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/mask/MaskProcessor.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -21,4 +21,5 @@ package com.mybatisflex.core.mask;
public interface MaskProcessor {
Object mask(Object data);
}

11
mybatis-flex-core/src/main/java/com/mybatisflex/core/mask/MaskTypeHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -33,25 +33,26 @@ public class MaskTypeHandler extends BaseTypeHandler<Object> {
@Override
public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException {
ps.setString(i,parameter.toString());
ps.setString(i, parameter.toString());
}
@Override
public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
String data = rs.getString(columnName);
return MaskManager.mask(maskType,data);
return MaskManager.mask(maskType, data);
}
@Override
public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
String data = rs.getString(columnIndex);
return MaskManager.mask(maskType,data);
return MaskManager.mask(maskType, data);
}
@Override
public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
String data = cs.getString(columnIndex);
return MaskManager.mask(maskType,data);
return MaskManager.mask(maskType, data);
}
}

7
mybatis-flex-core/src/main/java/com/mybatisflex/core/mask/Masks.java
View File

@ -20,7 +20,8 @@ package com.mybatisflex.core.mask;
*/
public class Masks {
private Masks() {}
private Masks() {
}
/**
* 手机号脱敏
@ -183,8 +184,8 @@ public class Masks {
* 密码 脱敏
*/
static MaskProcessor PASSWORD_PROCESSOR = data -> {
if (data instanceof String ) {
return mask((String) data, 0, 0, ((String) data).length()) ;
if (data instanceof String) {
return mask((String) data, 0, 0, ((String) data).length());
}
return data;
};

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java
View File

@ -341,4 +341,5 @@ public class FlexConfiguration extends Configuration {
, new MapperInvocationHandler(mapper, this));
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java
View File

@ -87,5 +87,7 @@ public class FlexResultSetHandler extends DefaultResultSetHandler {
public Iterator<T> iterator() {
return originalCursor.iterator();
}
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexSqlSessionFactoryBuilder.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");

9
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/MappedStatementTypes.java
View File

@ -17,19 +17,20 @@ package com.mybatisflex.core.mybatis;
public class MappedStatementTypes {
private MappedStatementTypes() {}
private MappedStatementTypes() {
}
private static ThreadLocal<Class<?>> currentTypeTL = new ThreadLocal<>();
public static void setCurrentType(Class<?> type){
public static void setCurrentType(Class<?> type) {
currentTypeTL.set(type);
}
public static Class<?> getCurrentType(){
public static Class<?> getCurrentType() {
return currentTypeTL.get();
}
public static void clear(){
public static void clear() {
currentTypeTL.remove();
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/SqlArgsParameterHandler.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -90,4 +90,5 @@ public class SqlArgsParameterHandler extends DefaultParameterHandler {
ps.setTimestamp(index, new java.sql.Timestamp(value.getTime()));
}
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/TypeHandlerObject.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -37,4 +37,5 @@ public class TypeHandlerObject implements Serializable {
public void setParameter(PreparedStatement ps, int i) throws SQLException {
typeHandler.setParameter(ps, i, value, jdbcType);
}
}

7
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/executor/CacheKeyBuilder.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -23,10 +23,11 @@ import java.util.Map;
public interface CacheKeyBuilder {
default CacheKey buildCacheKey(CacheKey cacheKey, Object parameterObject){
if (parameterObject instanceof Map && ((Map) parameterObject).containsKey(FlexConsts.SQL_ARGS)){
default CacheKey buildCacheKey(CacheKey cacheKey, Object parameterObject) {
if (parameterObject instanceof Map && ((Map) parameterObject).containsKey(FlexConsts.SQL_ARGS)) {
cacheKey.update(Arrays.toString((Object[]) ((Map<?, ?>) parameterObject).get(FlexConsts.SQL_ARGS)));
}
return cacheKey;
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/executor/FlexBatchExecutor.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -143,4 +143,5 @@ public class FlexBatchExecutor extends BatchExecutor implements CacheKeyBuilder
batchResultList.clear();
}
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/executor/FlexReuseExecutor.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -31,6 +31,7 @@ public class FlexReuseExecutor extends ReuseExecutor implements CacheKeyBuilder
@Override
public CacheKey createCacheKey(MappedStatement ms, Object parameterObject, RowBounds rowBounds, BoundSql boundSql) {
return buildCacheKey(super.createCacheKey(ms, parameterObject, rowBounds, boundSql),parameterObject);
return buildCacheKey(super.createCacheKey(ms, parameterObject, rowBounds, boundSql), parameterObject);
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/executor/FlexSimpleExecutor.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -31,6 +31,7 @@ public class FlexSimpleExecutor extends SimpleExecutor implements CacheKeyBuilde
@Override
public CacheKey createCacheKey(MappedStatement ms, Object parameterObject, RowBounds rowBounds, BoundSql boundSql) {
return buildCacheKey(super.createCacheKey(ms, parameterObject, rowBounds, boundSql),parameterObject);
return buildCacheKey(super.createCacheKey(ms, parameterObject, rowBounds, boundSql), parameterObject);
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java
View File

@ -70,7 +70,6 @@ public class Page<T> implements Serializable {
}
/**
* 获取当前页的数据。
*
@ -277,4 +276,5 @@ public class Page<T> implements Serializable {
", records=" + records +
'}';
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java
View File

@ -147,5 +147,7 @@ public class ArithmeticQueryColumn extends QueryColumn {
throw FlexExceptions.wrap(e);
}
}
}
}

17
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
View File

@ -127,8 +127,8 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
joinTables.add(queryTable);
}
protected void addEndFragment(String fragment){
if (endFragments == null){
protected void addEndFragment(String fragment) {
if (endFragments == null) {
endFragments = new ArrayList<>();
}
endFragments.add(fragment);
@ -251,14 +251,14 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
this.context = context;
}
protected void putContext(String key, Object value){
if (context == null){
protected void putContext(String key, Object value) {
if (context == null) {
context = new HashMap<>();
}
context.put(key,value);
context.put(key, value);
}
protected <R> R getContext(String key){
protected <R> R getContext(String key) {
return context == null ? null : (R) context.get(key);
}
@ -278,11 +278,11 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
clone.orderBys = CollectionUtil.cloneArrayList(this.orderBys);
clone.unions = CollectionUtil.cloneArrayList(this.unions);
// copy List if necessary ...
if (this.endFragments != null){
if (this.endFragments != null) {
clone.endFragments = CollectionUtil.newArrayList(this.endFragments);
}
// copy Map if necessary ...
if (this.context != null){
if (this.context != null) {
clone.context = CollectionUtil.newHashMap(this.context);
}
return clone;
@ -290,4 +290,5 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
throw FlexExceptions.wrap(e);
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java
View File

@ -123,4 +123,5 @@ public class Brackets extends QueryCondition {
clone.childCondition = ObjectUtil.clone(this.childCondition);
return clone;
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
View File

@ -42,7 +42,6 @@ public class CPI {
}
public static With getWith(QueryWrapper queryWrapper) {
return queryWrapper.with;
}
@ -235,4 +234,5 @@ public class CPI {
public static boolean isSameTable(QueryTable queryTable, QueryTable otherTable) {
return queryTable.isSameTable(otherTable);
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java
View File

@ -91,6 +91,7 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn {
public static class When implements CloneSupport<When> {
private QueryCondition whenCondition;
private Object thenValue;
@ -114,6 +115,7 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn {
throw FlexExceptions.wrap(e);
}
}
}
public static class Builder {
@ -148,6 +150,9 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn {
this.builder.caseQueryColumn.addWhen(builder.lastWhen);
return builder;
}
}
}
}

5
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java
View File

@ -91,6 +91,7 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum
public static class When implements CloneSupport<When> {
private Object searchValue;
private Object thenValue;
@ -114,6 +115,7 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum
throw FlexExceptions.wrap(e);
}
}
}
@ -153,6 +155,9 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum
this.builder.caseQueryColumn.addWhen(builder.lastWhen);
return builder;
}
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java
View File

@ -61,4 +61,5 @@ public class DistinctQueryColumn extends QueryColumn {
clone.queryColumns = CollectionUtil.cloneArrayList(this.queryColumns);
return clone;
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java
View File

@ -133,7 +133,6 @@ public class FunctionQueryColumn extends QueryColumn implements HasParamsColumn
}
@Override
public String toString() {
return "FunctionQueryColumn{" +

17
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/HasParamsColumn.java
View File

@ -1,6 +1,23 @@
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
*/
package com.mybatisflex.core.query;
public interface HasParamsColumn {
Object[] getParamValues();
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Join.java
View File

@ -100,4 +100,5 @@ public class Join implements CloneSupport<Join> {
throw FlexExceptions.wrap(e);
}
}
}

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Joiner.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -52,5 +52,6 @@ public class Joiner<M> {
join.on(newWrapper.whereQueryCondition);
return queryWrapper;
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorQueryCondition.java
View File

@ -82,4 +82,5 @@ public class OperatorQueryCondition extends QueryCondition {
clone.childCondition = ObjectUtil.clone(this.childCondition);
return clone;
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
View File

@ -28,6 +28,7 @@ import java.util.List;
* 示例2：and not EXISTS (select ... from ... where ....)
*/
public class OperatorSelectCondition extends QueryCondition {
//操作符，例如 exist, not exist
private final String operator;
private QueryWrapper queryWrapper;
@ -82,4 +83,5 @@ public class OperatorSelectCondition extends QueryCondition {
clone.queryWrapper = ObjectUtil.clone(this.queryWrapper);
return clone;
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
View File

@ -589,4 +589,5 @@ public class QueryColumn implements CloneSupport<QueryColumn> {
throw FlexExceptions.wrap(e);
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java
View File

@ -302,4 +302,5 @@ public class QueryCondition implements CloneSupport<QueryCondition> {
throw FlexExceptions.wrap(e);
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryOrderBy.java
View File

@ -84,4 +84,5 @@ public class QueryOrderBy implements CloneSupport<QueryOrderBy> {
throw FlexExceptions.wrap(e);
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
View File

@ -126,4 +126,5 @@ public class QueryTable implements CloneSupport<QueryTable> {
throw FlexExceptions.wrap(e);
}
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -731,4 +731,5 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
public QueryWrapper clone() {
return super.clone();
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawFragment.java
View File

@ -68,4 +68,5 @@ public class RawFragment extends QueryCondition {
public String getContent() {
return content;
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java
View File

@ -60,4 +60,5 @@ public class SelectQueryColumn extends QueryColumn implements HasParamsColumn {
public Object[] getParamValues() {
return queryWrapper.getValueArray();
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java
View File

@ -62,4 +62,5 @@ public class SelectQueryTable extends QueryTable {
clone.queryWrapper = this.queryWrapper.clone();
return clone;
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SqlConnector.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
@ -19,7 +19,7 @@ public enum SqlConnector {
AND(" AND "),
// AND_NOT(" AND NOT "),
// AND_NOT(" AND NOT "),
// AND_EXISTS(" AND EXISTS "),
// AND_NOT_EXISTS(" AND NOT EXISTS "),
OR(" OR "),

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java
View File

@ -93,4 +93,5 @@ public class StringFunctionQueryColumn extends QueryColumn {
clone.params = CollectionUtil.newArrayList(this.params);
return clone;
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringQueryColumn.java
View File

@ -53,4 +53,5 @@ public class StringQueryColumn extends QueryColumn {
public StringQueryColumn clone() {
return (StringQueryColumn) super.clone();
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringQueryOrderBy.java
View File

@ -42,4 +42,5 @@ public class StringQueryOrderBy extends QueryOrderBy {
public StringQueryOrderBy clone() {
return (StringQueryOrderBy) super.clone();
}
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/UnionWrapper.java
View File

@ -77,4 +77,5 @@ public class UnionWrapper implements CloneSupport<UnionWrapper> {
throw FlexExceptions.wrap(e);
}
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithBuilder.java
View File

@ -17,7 +17,9 @@ package com.mybatisflex.core.query;
import com.mybatisflex.core.util.CollectionUtil;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
public class WithBuilder {

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithDetail.java
View File

@ -22,4 +22,5 @@ public interface WithDetail extends CloneSupport<WithDetail> {
String toSql(IDialect dialect);
Object[] getParamValues();
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithItem.java
View File

@ -66,7 +66,7 @@ public class WithItem implements CloneSupport<WithItem> {
public String toSql(IDialect dialect) {
StringBuilder sql = new StringBuilder(name);
if (CollectionUtil.isNotEmpty(params)){
if (CollectionUtil.isNotEmpty(params)) {
sql.append(BRACKET_LEFT).append(StringUtil.join(DELIMITER, params)).append(BRACKET_RIGHT);
}
sql.append(AS).append(BRACKET_LEFT);

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
View File

@ -33,7 +33,8 @@ import java.util.List;
class WrapperUtil {
private WrapperUtil() {}
private WrapperUtil() {
}
static List<QueryWrapper> getChildQueryWrapper(QueryCondition condition) {
List<QueryWrapper> list = null;
@ -154,7 +155,8 @@ class WrapperUtil {
return StringUtil.isBlank(alias) ? SqlConsts.EMPTY : getAsKeyWord(dialect) + dialect.wrap(alias);
}
private static String getAsKeyWord(IDialect dialect){
private static String getAsKeyWord(IDialect dialect) {
return dialect instanceof OracleDialect ? SqlConsts.BLANK : SqlConsts.AS;
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/AbstractRelation.java
View File

@ -62,7 +62,7 @@ abstract class AbstractRelation<SelfEntity> {
String dataSource, Class<SelfEntity> entityClass, Field relationField,
String extraCondition
) {
this.name = entityClass.getSimpleName()+"."+relationField.getName();
this.name = entityClass.getSimpleName() + "." + relationField.getName();
this.simpleName = relationField.getName();
this.selfEntityClass = entityClass;
this.relationField = relationField;

Some files were not shown because too many files have changed in this diff Show More