From 27bc9369f87955d53dfe1e790520d55532c3bd50 Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 11:26:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/net/apexes/commons/querydsl/QuerydslDao.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java index 972e5a7..050dfb0 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java @@ -547,10 +547,11 @@ public class QuerydslDao implements Dao { List valueList = new ArrayList<>(); for (int i = 0; i < paths.length; i++) { Path path = paths[i]; - if (!qvar.hasDefaultValue(path)) { - pathList.add(path); - valueList.add(values[i]); + if (values[i] == null && qvar.hasDefaultValue(path)) { + continue; } + pathList.add(path); + valueList.add(values[i]); } if (pathList.size() != paths.length) { paths = pathList.toArray(new Path[0]); -- Gitee From 948720a67a1ed3ad21b1d2b3eda85af0ca758ade Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 11:35:42 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/net/apexes/commons/querydsl/QuerydslDao.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java index 050dfb0..74b56c3 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java @@ -546,11 +546,10 @@ public class QuerydslDao implements Dao { List> pathList = new ArrayList<>(); List valueList = new ArrayList<>(); for (int i = 0; i < paths.length; i++) { - Path path = paths[i]; - if (values[i] == null && qvar.hasDefaultValue(path)) { + if (values[i] == null && qvar.hasDefaultValue(paths[i])) { continue; } - pathList.add(path); + pathList.add(paths[i]); valueList.add(values[i]); } if (pathList.size() != paths.length) { -- Gitee From 36511108053867a9ed6db884d2695ea2821f80d3 Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 12:59:01 +0800 Subject: [PATCH 03/11] =?UTF-8?q?@Tx=E5=9C=A8=E9=81=87=E5=88=B0SQLExceptio?= =?UTF-8?q?n=E6=97=B6=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/apexes/commons/guice/tx/Tx.java | 4 +- .../apexes/commons/guice/tx/TxConnection.java | 1 - .../commons/guice/tx/TxInterceptor.java | 43 ++++++++----------- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/Tx.java b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/Tx.java index 8bdf983..c67c8bd 100644 --- a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/Tx.java +++ b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/Tx.java @@ -21,9 +21,9 @@ import java.lang.annotation.Target; @Inherited public @interface Tx { - Class[] rollback() default RuntimeException.class; + Class[] rollback() default RuntimeException.class; - Class[] ignore() default {}; + Class[] ignore() default {}; Isolation isolation() default Isolation.DEFAULT; diff --git a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxConnection.java b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxConnection.java index ca0e65b..9d1f5d5 100644 --- a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxConnection.java +++ b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxConnection.java @@ -43,7 +43,6 @@ public class TxConnection implements Connection { if (delegate.getTransactionIsolation() != isolation) { delegate.setTransactionIsolation(isolation); } - delegate.setReadOnly(false); delegate.setAutoCommit(true); delegate.close(); } diff --git a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java index 7f8227e..4cc219f 100644 --- a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java +++ b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java @@ -10,6 +10,7 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import java.lang.reflect.Method; +import java.sql.SQLException; /** * @@ -32,11 +33,13 @@ public class TxInterceptor implements MethodInterceptor { try { result = invocation.proceed(); Txs.commit(); - } catch (Exception e) { - if (rollbackIfNecessary(tx, e)) { + } catch (Throwable throwable) { + if (throwable instanceof SQLException) { + Txs.rollback(); + } else if (rollbackIfNecessary(tx, throwable)) { Txs.rollback(); } - throw e; + throw throwable; } finally { Txs.end(); } @@ -57,31 +60,21 @@ public class TxInterceptor implements MethodInterceptor { return tx; } - private boolean rollbackIfNecessary(Tx tx, Exception e) { - boolean commit = true; - - //check rollback clauses - for (Class rollBackOn : tx.rollback()) { - //if one matched, try to perform a rollback - if (rollBackOn.isInstance(e)) { - commit = false; - - //check ignore clauses (supercedes rollback clause) - for (Class exceptOn : tx.ignore()) { - //An exception to the rollback clause was found, DON'T rollback - // (i.e. commit and throw anyway) - if (exceptOn.isInstance(e)) { - commit = true; - break; - } - } - - //otherwise continue to commit + private boolean rollbackIfNecessary(Tx tx, Throwable throwable) { + boolean rollback = false; + for (Class rollBackOn : tx.rollback()) { + if (rollBackOn.isInstance(throwable)) { + rollback = true; break; } } - - return commit; + for (Class ignoreOn : tx.ignore()) { + if (ignoreOn.isInstance(throwable)) { + rollback = false; + break; + } + } + return rollback; } } -- Gitee From 2e8274336a8bbd72c36b41c753e502c610890132 Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 13:02:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?@Tx=E5=9C=A8=E9=81=87=E5=88=B0SQLExceptio?= =?UTF-8?q?n=E6=97=B6=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/net/apexes/commons/guice/tx/TxInterceptor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java index 4cc219f..16d032f 100644 --- a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java +++ b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java @@ -34,9 +34,7 @@ public class TxInterceptor implements MethodInterceptor { result = invocation.proceed(); Txs.commit(); } catch (Throwable throwable) { - if (throwable instanceof SQLException) { - Txs.rollback(); - } else if (rollbackIfNecessary(tx, throwable)) { + if (throwable instanceof SQLException || rollbackIfNecessary(tx, throwable)) { Txs.rollback(); } throw throwable; -- Gitee From 857b36e3c3192b041e5bcd03320a386de03886d6 Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 22:05:00 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/querydsl/AbstractDaoHelper.java | 6 - .../java/net/apexes/commons/querydsl/Dao.java | 76 +++++----- .../apexes/commons/querydsl/DaoHelper.java | 2 - .../apexes/commons/querydsl/QuerydslDao.java | 138 +++++++++--------- 4 files changed, 110 insertions(+), 112 deletions(-) diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/AbstractDaoHelper.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/AbstractDaoHelper.java index 5006cb2..f720f0d 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/AbstractDaoHelper.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/AbstractDaoHelper.java @@ -37,12 +37,6 @@ public abstract class AbstractDaoHelper implements DaoHelper { return new QuerydslDao<>(factory(release), qvar); } - @Override - public Dao.SelectExecuter query(TablePathBase qvar) { - Dao dao = dao(qvar); - return dao.query(); - } - @Override public Dao.UpdateExecuter update(TablePathBase qvar) { Dao dao = dao(qvar); diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/Dao.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/Dao.java index 1a1267d..6150acf 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/Dao.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/Dao.java @@ -26,74 +26,78 @@ public interface Dao { * * @return */ - SelectExecuter query(); + SelectExecuter select(); - List select(BooleanExpression condition, OrderSpecifier... orders); + SelectExecuter select(Path... columns); - List select(BooleanExpression condition, Paging paging, OrderSpecifier... orders); + SelectExecuter selectExclude(Path... columns); - List select(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders); + List find(BooleanExpression condition, OrderSpecifier... orders); - List select(BooleanExpression condition, IncludeColumns includeColumns, Paging paging, + List find(BooleanExpression condition, Paging paging, OrderSpecifier... orders); + + List find(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders); + + List find(BooleanExpression condition, IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders); - List select(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + List find(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, OrderSpecifier... orders); - List select(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + List find(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, Paging paging, OrderSpecifier... orders); - List select(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders); + List find(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders); - List select(BooleanExpression condition, ExcludeColumns excludeColumns, Paging paging, + List find(BooleanExpression condition, ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders); - List select(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + List find(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, OrderSpecifier... orders); - List select(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + List find(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, Paging paging, OrderSpecifier... orders); - List selectAll(OrderSpecifier... orders); + List findAll(OrderSpecifier... orders); - List selectAll(Paging paging, OrderSpecifier... orders); + List findAll(Paging paging, OrderSpecifier... orders); - List selectAll(IncludeColumns includeColumns, OrderSpecifier... orders); + List findAll(IncludeColumns includeColumns, OrderSpecifier... orders); - List selectAll(IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders); + List findAll(IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders); - List selectAll(ExcludeColumns excludeColumns, OrderSpecifier... orders); + List findAll(ExcludeColumns excludeColumns, OrderSpecifier... orders); - List selectAll(ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders); + List findAll(ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders); - E selectByPk(ID pk); + E findByPk(ID pk); - E selectByPk(ID pk, IncludeColumns includeColumns); + E findByPk(ID pk, IncludeColumns includeColumns); - E selectByPk(ID pk, ExcludeColumns excludeColumns); + E findByPk(ID pk, ExcludeColumns excludeColumns); - E selectOne(BooleanExpression condition); + E findOne(BooleanExpression condition); - E selectOne(BooleanExpression condition, IncludeColumns includeColumns); + E findOne(BooleanExpression condition, IncludeColumns includeColumns); - E selectOne(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy); + E findOne(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy); - E selectOne(BooleanExpression condition, ExcludeColumns excludeColumns); + E findOne(BooleanExpression condition, ExcludeColumns excludeColumns); - E selectOne(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy); + E findOne(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy); - E selectFirst(BooleanExpression condition, OrderSpecifier... orders); + E findFirst(BooleanExpression condition, OrderSpecifier... orders); - E selectFirst(BooleanExpression condition, GroupBy groupBy, OrderSpecifier... orders); + E findFirst(BooleanExpression condition, GroupBy groupBy, OrderSpecifier... orders); - E selectFirst(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders); + E findFirst(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders); - E selectFirst(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + E findFirst(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, OrderSpecifier... orders); - E selectFirst(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders); + E findFirst(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders); - E selectFirst(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + E findFirst(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, OrderSpecifier... orders); boolean exist(); @@ -164,10 +168,6 @@ public interface Dao { */ interface SelectExecuter { - SelectExecuter include(Path... columns); - - SelectExecuter exclude(Path... columns); - SelectExecuter where(BooleanExpression where); SelectExecuter where(ID pk); @@ -184,11 +184,11 @@ public interface Dao { SelectExecuter limit(long limit); - List select(); + List fetch(); - E selectFirst(); + E fetchFirst(); - E selectOne(); + E fetchOne(); } /** diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/DaoHelper.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/DaoHelper.java index 4bf898c..07c3aad 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/DaoHelper.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/DaoHelper.java @@ -44,8 +44,6 @@ public interface DaoHelper { */ Dao dao(TablePathBase qvar, boolean release); - Dao.SelectExecuter query(TablePathBase qvar); - Dao.UpdateExecuter update(TablePathBase qvar); } diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java index 74b56c3..4942d61 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java @@ -47,131 +47,141 @@ public class QuerydslDao implements Dao { } @Override - public SelectExecuter query() { + public SelectExecuter select() { return new SelectExecuterImpl(); } @Override - public List select(BooleanExpression condition, OrderSpecifier... orders) { - return select(condition, (ExcludeColumns) null, orders); + public SelectExecuter select(Path... columns) { + return new SelectExecuterImpl(IncludeColumns.of(columns)); } @Override - public List select(BooleanExpression condition, Paging paging, OrderSpecifier... orders) { - return select(condition, (ExcludeColumns) null, paging, orders); + public SelectExecuter selectExclude(Path... columns) { + return new SelectExecuterImpl(ExcludeColumns.of(columns)); } @Override - public List select(BooleanExpression condition, ExcludeColumns excludeColumns, + public List find(BooleanExpression condition, OrderSpecifier... orders) { + return find(condition, (ExcludeColumns) null, orders); + } + + @Override + public List find(BooleanExpression condition, Paging paging, OrderSpecifier... orders) { + return find(condition, (ExcludeColumns) null, paging, orders); + } + + @Override + public List find(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders) { - return select(condition, excludeColumns, null, null, orders); + return find(condition, excludeColumns, null, null, orders); } @Override - public List select(BooleanExpression condition, ExcludeColumns excludeColumns, Paging paging, + public List find(BooleanExpression condition, ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders) { - return select(condition, excludeColumns, null, paging, orders); + return find(condition, excludeColumns, null, paging, orders); } @Override - public List select(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + public List find(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, OrderSpecifier... orders) { - return select(condition, excludeColumns, groupBy, null, orders); + return find(condition, excludeColumns, groupBy, null, orders); } @Override - public List select(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + public List find(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, Paging paging, OrderSpecifier... orders) { Checks.verifyNotNull(condition, "condition"); return fetch(condition, excludeColumns, paging, groupBy, orders); } @Override - public List select(BooleanExpression condition, IncludeColumns includeColumns, + public List find(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders) { - return select(condition, includeColumns, null, null, orders); + return find(condition, includeColumns, null, null, orders); } @Override - public List select(BooleanExpression condition, IncludeColumns includeColumns, Paging paging, + public List find(BooleanExpression condition, IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders) { - return select(condition, includeColumns, null, paging, orders); + return find(condition, includeColumns, null, paging, orders); } @Override - public List select(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + public List find(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, OrderSpecifier... orders) { - return select(condition, includeColumns, groupBy, null, orders); + return find(condition, includeColumns, groupBy, null, orders); } @Override - public List select(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + public List find(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, Paging paging, OrderSpecifier... orders) { Checks.verifyNotNull(condition, "condition"); return fetch(condition, includeColumns, paging, groupBy, orders); } @Override - public List selectAll(OrderSpecifier... orders) { + public List findAll(OrderSpecifier... orders) { return factory.select(qvar).from(qvar).orderBy(orders).fetch(); } @Override - public List selectAll(Paging paging, OrderSpecifier... orders) { - return selectAll((IncludeColumns) null, null, orders); + public List findAll(Paging paging, OrderSpecifier... orders) { + return findAll((IncludeColumns) null, null, orders); } @Override - public List selectAll(IncludeColumns includeColumns, OrderSpecifier... orders) { - return selectAll(includeColumns, null, orders); + public List findAll(IncludeColumns includeColumns, OrderSpecifier... orders) { + return findAll(includeColumns, null, orders); } @Override - public List selectAll(IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders) { + public List findAll(IncludeColumns includeColumns, Paging paging, OrderSpecifier... orders) { return fetch(null, includeColumns, paging, null, orders); } @Override - public List selectAll(ExcludeColumns excludeColumns, OrderSpecifier... orders) { - return selectAll(excludeColumns, null, orders); + public List findAll(ExcludeColumns excludeColumns, OrderSpecifier... orders) { + return findAll(excludeColumns, null, orders); } @Override - public List selectAll(ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders) { + public List findAll(ExcludeColumns excludeColumns, Paging paging, OrderSpecifier... orders) { return fetch(null, excludeColumns, paging, null, orders); } @Override - public E selectByPk(ID pk) { + public E findByPk(ID pk) { Checks.verifyNotNull(pk, "pk"); - return selectOne(pkValueEqExpr(pk)); + return findOne(pkValueEqExpr(pk)); } @Override - public E selectByPk(ID pk, IncludeColumns includeColumns) { + public E findByPk(ID pk, IncludeColumns includeColumns) { Checks.verifyNotNull(pk, "pk"); - return selectOne(pkValueEqExpr(pk), includeColumns); + return findOne(pkValueEqExpr(pk), includeColumns); } @Override - public E selectByPk(ID pk, ExcludeColumns excludeColumns) { + public E findByPk(ID pk, ExcludeColumns excludeColumns) { Checks.verifyNotNull(pk, "pk"); - return selectOne(pkValueEqExpr(pk), excludeColumns); + return findOne(pkValueEqExpr(pk), excludeColumns); } @Override - public E selectOne(BooleanExpression condition) { + public E findOne(BooleanExpression condition) { Checks.verifyNotNull(condition, "condition"); return fetchOne(qvar, condition, null); } @Override - public E selectOne(BooleanExpression condition, IncludeColumns includeColumns) { - return selectOne(condition, includeColumns, null); + public E findOne(BooleanExpression condition, IncludeColumns includeColumns) { + return findOne(condition, includeColumns, null); } @Override - public E selectOne(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy) { + public E findOne(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy) { Checks.verifyNotNull(condition, "condition"); Expression projection = qvar; if (includeColumns != null) { @@ -181,12 +191,12 @@ public class QuerydslDao implements Dao { } @Override - public E selectOne(BooleanExpression condition, ExcludeColumns excludeColumns) { - return selectOne(condition, excludeColumns, null); + public E findOne(BooleanExpression condition, ExcludeColumns excludeColumns) { + return findOne(condition, excludeColumns, null); } @Override - public E selectOne(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy) { + public E findOne(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy) { Checks.verifyNotNull(condition, "condition"); Expression projection = qvar; if (excludeColumns != null) { @@ -196,22 +206,22 @@ public class QuerydslDao implements Dao { } @Override - public E selectFirst(BooleanExpression condition, OrderSpecifier... orders) { - return selectFirst(condition, (GroupBy) null, orders); + public E findFirst(BooleanExpression condition, OrderSpecifier... orders) { + return findFirst(condition, (GroupBy) null, orders); } @Override - public E selectFirst(BooleanExpression condition, GroupBy groupBy, OrderSpecifier... orders) { + public E findFirst(BooleanExpression condition, GroupBy groupBy, OrderSpecifier... orders) { return fetchFirst(qvar, condition, groupBy, orders); } @Override - public E selectFirst(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders) { - return selectFirst(condition, includeColumns, null, orders); + public E findFirst(BooleanExpression condition, IncludeColumns includeColumns, OrderSpecifier... orders) { + return findFirst(condition, includeColumns, null, orders); } @Override - public E selectFirst(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, + public E findFirst(BooleanExpression condition, IncludeColumns includeColumns, GroupBy groupBy, OrderSpecifier... orders) { Expression projection = qvar; if (includeColumns != null) { @@ -221,12 +231,12 @@ public class QuerydslDao implements Dao { } @Override - public E selectFirst(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders) { - return selectFirst(condition, excludeColumns, null, orders); + public E findFirst(BooleanExpression condition, ExcludeColumns excludeColumns, OrderSpecifier... orders) { + return findFirst(condition, excludeColumns, null, orders); } @Override - public E selectFirst(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, + public E findFirst(BooleanExpression condition, ExcludeColumns excludeColumns, GroupBy groupBy, OrderSpecifier... orders) { Expression projection = qvar; if (excludeColumns != null) { @@ -596,7 +606,7 @@ public class QuerydslDao implements Dao { */ private class SelectExecuterImpl implements SelectExecuter { - private IncludeColumns includeColumns; + private IncludeColumns includeColumns; private ExcludeColumns excludeColumns; private BooleanExpression where; private OrderSpecifier[] orderBys; @@ -608,18 +618,14 @@ public class QuerydslDao implements Dao { private SelectExecuterImpl() { } - @Override - public SelectExecuter include(Path... columns) { - this.includeColumns = IncludeColumns.of(columns); + private SelectExecuterImpl(IncludeColumns includeColumns) { + this.includeColumns = includeColumns; this.excludeColumns = null; - return this; } - @Override - public SelectExecuter exclude(Path... columns) { + private SelectExecuterImpl(ExcludeColumns excludeColumns) { this.includeColumns = null; - this.excludeColumns = ExcludeColumns.of(columns); - return this; + this.excludeColumns = excludeColumns; } @Override @@ -672,29 +678,29 @@ public class QuerydslDao implements Dao { } @Override - public List select() { + public List fetch() { if (excludeColumns == null) { - return fetch(where, includeColumns, createPaging(), createGroupBy(), orderBys); + return QuerydslDao.this.fetch(where, includeColumns, createPaging(), createGroupBy(), orderBys); } - return fetch(where, excludeColumns, createPaging(), createGroupBy(), orderBys); + return QuerydslDao.this.fetch(where, excludeColumns, createPaging(), createGroupBy(), orderBys); } @Override - public E selectFirst() { + public E fetchFirst() { Expression projection = qvar; if (excludeColumns != null) { projection = listColumns(excludeColumns); } - return fetchFirst(projection, where, createGroupBy(), orderBys); + return QuerydslDao.this.fetchFirst(projection, where, createGroupBy(), orderBys); } @Override - public E selectOne() { + public E fetchOne() { Expression projection = qvar; if (excludeColumns != null) { projection = listColumns(excludeColumns); } - return fetchOne(projection, where, createGroupBy()); + return QuerydslDao.this.fetchOne(projection, where, createGroupBy()); } private Paging createPaging() { -- Gitee From 8afa98de968d4dd1906903f8f000af6f4c22d2bb Mon Sep 17 00:00:00 2001 From: hedyn Date: Mon, 14 May 2018 22:07:32 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/apexes/commons/querydsl/QuerydslDao.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java index 4942d61..8e60693 100644 --- a/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java +++ b/apexes-commons-querydsl/src/main/java/net/apexes/commons/querydsl/QuerydslDao.java @@ -53,6 +53,9 @@ public class QuerydslDao implements Dao { @Override public SelectExecuter select(Path... columns) { + if (columns.length == 0) { + return new SelectExecuterImpl(); + } return new SelectExecuterImpl(IncludeColumns.of(columns)); } -- Gitee From 2d026acac73040b77004af9f2cd75562db02f0d6 Mon Sep 17 00:00:00 2001 From: hedyn Date: Tue, 15 May 2018 16:12:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dorg.postgresql.util.PSQ?= =?UTF-8?q?LException:=20ERROR:=20current=20transaction=20is=20aborted,=20?= =?UTF-8?q?commands=20ignored=20until=20end=20of=20transaction=20block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/net/apexes/commons/guice/tx/TxInterceptor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java index 16d032f..f477b2e 100644 --- a/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java +++ b/apexes-commons-guice-tx/src/main/java/net/apexes/commons/guice/tx/TxInterceptor.java @@ -36,6 +36,8 @@ public class TxInterceptor implements MethodInterceptor { } catch (Throwable throwable) { if (throwable instanceof SQLException || rollbackIfNecessary(tx, throwable)) { Txs.rollback(); + } else { + Txs.commit(); } throw throwable; } finally { -- Gitee From 829302dde0e3e7626ae4aa7a72b16b53b2923853 Mon Sep 17 00:00:00 2001 From: hedyn Date: Thu, 24 May 2018 22:44:59 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apexes/commons/net/JsonHttpCaller.java | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/apexes-commons-lang/src/main/java/net/apexes/commons/net/JsonHttpCaller.java b/apexes-commons-lang/src/main/java/net/apexes/commons/net/JsonHttpCaller.java index 937f5ac..638fdd8 100644 --- a/apexes-commons-lang/src/main/java/net/apexes/commons/net/JsonHttpCaller.java +++ b/apexes-commons-lang/src/main/java/net/apexes/commons/net/JsonHttpCaller.java @@ -22,7 +22,7 @@ public class JsonHttpCaller { protected final StringHttpCaller caller; private final JsonEncoder jsonEncoder; private final JsonDecoder jsonDecoder; - private RequestEncoder requestEncoder; + private StringHttpCaller.RequestEncoder requestEncoder; public JsonHttpCaller(String url, JsonEncoder encoder, JsonDecoder decoder) { Checks.verifyNotNull(encoder, "encoder"); @@ -79,8 +79,8 @@ public class JsonHttpCaller { return this; } - public JsonHttpCaller setRequestEncoder(RequestEncoder requestEncoder) { - caller.setRequestEncoder(new RequestEncoderAdapter(this, requestEncoder)); + public JsonHttpCaller setRequestEncoder(StringHttpCaller.RequestEncoder requestEncoder) { + caller.setRequestEncoder(requestEncoder); return this; } @@ -149,26 +149,6 @@ public class JsonHttpCaller { } - /** - * - * @author HeDYn - */ - private static class RequestEncoderAdapter implements StringHttpCaller.RequestEncoder { - - private final JsonHttpCaller jsonHttpCaller; - private final RequestEncoder encoder; - - private RequestEncoderAdapter(JsonHttpCaller jsonHttpCaller, RequestEncoder encoder) { - this.jsonHttpCaller = jsonHttpCaller; - this.encoder = encoder; - } - - @Override - public byte[] encode(StringHttpCaller caller, String request, boolean compress) throws Exception { - return encoder.encode(jsonHttpCaller, request, compress); - } - } - /** * * @author HeDYn @@ -187,11 +167,4 @@ public class JsonHttpCaller { R fromJson(String json) throws Exception; } - /** - * - * @author HeDYn - */ - public interface RequestEncoder { - byte[] encode(JsonHttpCaller caller, String request, boolean compress) throws Exception; - } } -- Gitee From 45047b35851f821caf1e9f7ed577e97c89531133 Mon Sep 17 00:00:00 2001 From: hedyn Date: Sun, 27 May 2018 14:03:32 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/apexes/commons/lang/Networks.java | 39 ++++++++++++------- .../apexes/commons/net/StringHttpCaller.java | 23 +++++------ 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/apexes-commons-lang/src/main/java/net/apexes/commons/lang/Networks.java b/apexes-commons-lang/src/main/java/net/apexes/commons/lang/Networks.java index ca2ef1e..ebdceec 100644 --- a/apexes-commons-lang/src/main/java/net/apexes/commons/lang/Networks.java +++ b/apexes-commons-lang/src/main/java/net/apexes/commons/lang/Networks.java @@ -91,27 +91,20 @@ public final class Networks { public static HttpURLConnection connectExemptSSL(URL url) throws IOException, KeyManagementException, NoSuchAlgorithmException { - return connect(url, null, null); + return connect(url, exemptSSLContext(), exemptHostnameVerifier()); } public static HttpURLConnection connect(URL url, SSLContext sslContext, HostnameVerifier hostNameVerifier) - throws IOException, KeyManagementException, NoSuchAlgorithmException { + throws IOException { HttpURLConnection conn = (HttpURLConnection) url.openConnection(); if (HttpsURLConnection.class.isInstance(conn)) { HttpsURLConnection https = HttpsURLConnection.class.cast(conn); - if (hostNameVerifier == null) { - hostNameVerifier = new HostnameVerifier() { - @Override - public boolean verify(String s, SSLSession sslSession) { - return true; - } - }; + if (hostNameVerifier != null) { + https.setHostnameVerifier(hostNameVerifier); } - https.setHostnameVerifier(hostNameVerifier); - if (sslContext == null) { - sslContext = exemptSSLContext(); + if (sslContext != null) { + https.setSSLSocketFactory(sslContext.getSocketFactory()); } - https.setSSLSocketFactory(sslContext.getSocketFactory()); } return conn; } @@ -137,7 +130,7 @@ public final class Networks { /** * 创建一个不检查证书的SSLContext * - * @return 返回一个不检查证书的SSLContext + * @return 返回一个不检查证书的SSLContext实例 * @throws NoSuchAlgorithmException * @throws KeyManagementException */ @@ -147,6 +140,14 @@ public final class Networks { return context; } + /** + * 创建一个不验证的HostnameVerifier + * @return 返回一个不验证的HostnameVerifier实例 + */ + public static HostnameVerifier exemptHostnameVerifier() { + return exemptHostnameVerifier; + } + /** * 使用base64格式的证书创建KeyManager数组 * @@ -213,4 +214,14 @@ public final class Networks { } } + /** + * @author HeDYn + */ + private static final HostnameVerifier exemptHostnameVerifier = new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + return true; + } + }; + } diff --git a/apexes-commons-lang/src/main/java/net/apexes/commons/net/StringHttpCaller.java b/apexes-commons-lang/src/main/java/net/apexes/commons/net/StringHttpCaller.java index a7d6c40..8aaca2d 100644 --- a/apexes-commons-lang/src/main/java/net/apexes/commons/net/StringHttpCaller.java +++ b/apexes-commons-lang/src/main/java/net/apexes/commons/net/StringHttpCaller.java @@ -10,7 +10,6 @@ import net.apexes.commons.lang.Checks; import net.apexes.commons.lang.Networks; import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -19,6 +18,8 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.SocketException; import java.net.URL; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; import java.util.LinkedHashMap; import java.util.Map; import java.util.zip.GZIPInputStream; @@ -119,6 +120,12 @@ public class StringHttpCaller { return this; } + public StringHttpCaller exemptSSL() throws KeyManagementException, NoSuchAlgorithmException { + this.sslContext = Networks.exemptSSLContext(); + this.hostNameVerifier = Networks.exemptHostnameVerifier(); + return this; + } + public StringHttpCaller setHttpProperty(String key, String value) { Checks.verifyNotNull(key, "key"); Checks.verifyNotNull(value, "value"); @@ -206,23 +213,11 @@ public class StringHttpCaller { } protected HttpURLConnection openConnection(String method, URL url, boolean compress) throws Exception { - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + HttpURLConnection conn = Networks.connect(url, sslContext, hostNameVerifier); conn.setRequestMethod(method); conn.setDoOutput(true); conn.setDoInput(true); conn.setRequestProperty(PROPERTY_CONNECTION, CONNECTION_CLOSE); - - if (HttpsURLConnection.class.isInstance(conn)) { - HttpsURLConnection https = HttpsURLConnection.class.cast(conn); - if (hostNameVerifier != null) { - https.setHostnameVerifier(hostNameVerifier); - } - if (sslContext == null) { - sslContext = Networks.exemptSSLContext(); - } - https.setSSLSocketFactory(sslContext.getSocketFactory()); - } - conn.setConnectTimeout(connectTimeout); conn.setReadTimeout(readTimeout); if (compress) { -- Gitee From 14a79d1dbca7864ee0eddb0b7e9e613975338f9c Mon Sep 17 00:00:00 2001 From: hedyn Date: Sun, 27 May 2018 14:15:59 +0800 Subject: [PATCH 10/11] [maven-release-plugin] prepare release apexes-commons-0.0.4 --- apexes-commons-android/pom.xml | 8 ++++---- apexes-commons-eventbus/pom.xml | 4 ++-- apexes-commons-guice-tx/pom.xml | 4 ++-- apexes-commons-json/pom.xml | 6 +++--- apexes-commons-lang/pom.xml | 4 ++-- apexes-commons-lunar/pom.xml | 4 ++-- apexes-commons-ormlite/pom.xml | 6 +++--- apexes-commons-querydsl/pom.xml | 6 +++--- pom.xml | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apexes-commons-android/pom.xml b/apexes-commons-android/pom.xml index 48efe5c..0597659 100644 --- a/apexes-commons-android/pom.xml +++ b/apexes-commons-android/pom.xml @@ -3,25 +3,25 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-android - 0.0.4-SNAPSHOT + 0.0.4 net.apexes.commons apexes-commons-lang - 0.0.4-SNAPSHOT + 0.0.4 net.apexes.commons apexes-commons-ormlite - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-eventbus/pom.xml b/apexes-commons-eventbus/pom.xml index 7dd0390..d00bdf4 100644 --- a/apexes-commons-eventbus/pom.xml +++ b/apexes-commons-eventbus/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-eventbus - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-guice-tx/pom.xml b/apexes-commons-guice-tx/pom.xml index 7b65f44..b65ff66 100644 --- a/apexes-commons-guice-tx/pom.xml +++ b/apexes-commons-guice-tx/pom.xml @@ -3,12 +3,12 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml 4.0.0 apexes-commons-guice-tx - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-json/pom.xml b/apexes-commons-json/pom.xml index 24f7e53..eba7ad4 100644 --- a/apexes-commons-json/pom.xml +++ b/apexes-commons-json/pom.xml @@ -3,18 +3,18 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-json - 0.0.4-SNAPSHOT + 0.0.4 net.apexes.commons apexes-commons-lang - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-lang/pom.xml b/apexes-commons-lang/pom.xml index a2cbc36..be5b6f3 100644 --- a/apexes-commons-lang/pom.xml +++ b/apexes-commons-lang/pom.xml @@ -3,10 +3,10 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-lang - 0.0.4-SNAPSHOT + 0.0.4 \ No newline at end of file diff --git a/apexes-commons-lunar/pom.xml b/apexes-commons-lunar/pom.xml index c9cd9ab..bd8067f 100644 --- a/apexes-commons-lunar/pom.xml +++ b/apexes-commons-lunar/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-lunar - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-ormlite/pom.xml b/apexes-commons-ormlite/pom.xml index c0bddd9..745acbb 100644 --- a/apexes-commons-ormlite/pom.xml +++ b/apexes-commons-ormlite/pom.xml @@ -3,18 +3,18 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-ormlite - 0.0.4-SNAPSHOT + 0.0.4 net.apexes.commons apexes-commons-lang - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/apexes-commons-querydsl/pom.xml b/apexes-commons-querydsl/pom.xml index 43e8f89..97a30e2 100644 --- a/apexes-commons-querydsl/pom.xml +++ b/apexes-commons-querydsl/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 ../pom.xml apexes-commons-querydsl - 0.0.4-SNAPSHOT + 0.0.4 1.8 @@ -19,7 +19,7 @@ net.apexes.commons apexes-commons-lang - 0.0.4-SNAPSHOT + 0.0.4 diff --git a/pom.xml b/pom.xml index 1c8c32b..4a81e17 100644 --- a/pom.xml +++ b/pom.xml @@ -8,14 +8,14 @@ net.apexes.commons apexes-commons - 0.0.4-SNAPSHOT + 0.0.4 pom https://gitee.com/apexes/apexes-commons scm:git:https://gitee.com/apexes/apexes-commons.git scm:git:https://gitee.com/apexes/apexes-commons.git - HEAD + apexes-commons-0.0.4 -- Gitee From e3eb428b9485c9be70f1a2e6595b69f3d240bbeb Mon Sep 17 00:00:00 2001 From: hedyn Date: Sun, 27 May 2018 14:16:08 +0800 Subject: [PATCH 11/11] [maven-release-plugin] prepare for next development iteration --- apexes-commons-android/pom.xml | 8 ++++---- apexes-commons-eventbus/pom.xml | 4 ++-- apexes-commons-guice-tx/pom.xml | 4 ++-- apexes-commons-json/pom.xml | 6 +++--- apexes-commons-lang/pom.xml | 4 ++-- apexes-commons-lunar/pom.xml | 4 ++-- apexes-commons-ormlite/pom.xml | 6 +++--- apexes-commons-querydsl/pom.xml | 6 +++--- pom.xml | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apexes-commons-android/pom.xml b/apexes-commons-android/pom.xml index 0597659..0f7f394 100644 --- a/apexes-commons-android/pom.xml +++ b/apexes-commons-android/pom.xml @@ -3,25 +3,25 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-android - 0.0.4 + 0.0.5-SNAPSHOT net.apexes.commons apexes-commons-lang - 0.0.4 + 0.0.5-SNAPSHOT net.apexes.commons apexes-commons-ormlite - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-eventbus/pom.xml b/apexes-commons-eventbus/pom.xml index d00bdf4..f204041 100644 --- a/apexes-commons-eventbus/pom.xml +++ b/apexes-commons-eventbus/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-eventbus - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-guice-tx/pom.xml b/apexes-commons-guice-tx/pom.xml index b65ff66..f1b7c10 100644 --- a/apexes-commons-guice-tx/pom.xml +++ b/apexes-commons-guice-tx/pom.xml @@ -3,12 +3,12 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml 4.0.0 apexes-commons-guice-tx - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-json/pom.xml b/apexes-commons-json/pom.xml index eba7ad4..0eb8656 100644 --- a/apexes-commons-json/pom.xml +++ b/apexes-commons-json/pom.xml @@ -3,18 +3,18 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-json - 0.0.4 + 0.0.5-SNAPSHOT net.apexes.commons apexes-commons-lang - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-lang/pom.xml b/apexes-commons-lang/pom.xml index be5b6f3..3dc3aa8 100644 --- a/apexes-commons-lang/pom.xml +++ b/apexes-commons-lang/pom.xml @@ -3,10 +3,10 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-lang - 0.0.4 + 0.0.5-SNAPSHOT \ No newline at end of file diff --git a/apexes-commons-lunar/pom.xml b/apexes-commons-lunar/pom.xml index bd8067f..d0651de 100644 --- a/apexes-commons-lunar/pom.xml +++ b/apexes-commons-lunar/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-lunar - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-ormlite/pom.xml b/apexes-commons-ormlite/pom.xml index 745acbb..a6eb780 100644 --- a/apexes-commons-ormlite/pom.xml +++ b/apexes-commons-ormlite/pom.xml @@ -3,18 +3,18 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-ormlite - 0.0.4 + 0.0.5-SNAPSHOT net.apexes.commons apexes-commons-lang - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/apexes-commons-querydsl/pom.xml b/apexes-commons-querydsl/pom.xml index 97a30e2..abf5b9f 100644 --- a/apexes-commons-querydsl/pom.xml +++ b/apexes-commons-querydsl/pom.xml @@ -3,11 +3,11 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT ../pom.xml apexes-commons-querydsl - 0.0.4 + 0.0.5-SNAPSHOT 1.8 @@ -19,7 +19,7 @@ net.apexes.commons apexes-commons-lang - 0.0.4 + 0.0.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4a81e17..2eb4a7a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,14 +8,14 @@ net.apexes.commons apexes-commons - 0.0.4 + 0.0.5-SNAPSHOT pom https://gitee.com/apexes/apexes-commons scm:git:https://gitee.com/apexes/apexes-commons.git scm:git:https://gitee.com/apexes/apexes-commons.git - apexes-commons-0.0.4 + HEAD -- Gitee