Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: rename variables for better readability #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: rename variables for better readability #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/jfaster/mango/annotation/DB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* @return
*/
String name() default AbstractDataSourceFactory.DEFULT_NAME;
String name() default AbstractDataSourceFactory.DEFAULT_NAME;

/**
* 全局表名，在{@link SQL}的字符串参数，可以通过#table的方式引用此全局表名。
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/jfaster/mango/crud/named/factory/AbstractNamedBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public abstract class AbstractNamedBuilderFactory extends BuilderFactory {
@Nullable
@Override
public Builder doTryGetBuilder(String name, Type returnType, List<Type> parameterTypes, Class<?> entityClass, Class<?> idClass) {
int matchSize = metchSize(name);
int matchSize = matchSize(name);
if (matchSize == 0) {
return null;
}
Expand All @@ -52,14 +52,14 @@ public Builder doTryGetBuilder(String name, Type returnType, List<Type> paramete
return createCustomBuilder(name, parameterTypes, entityClass, info);
}

public abstract List<String> prefixs();
public abstract List<String> prefixes();

abstract AbstractNamedBuilder createCustomBuilder(
String methodName, List<Type> parameterTypes,
Class<?> entityClass, MethodNameInfo info);

private int metchSize(String name) {
for (String prefix : prefixs()) {
private int matchSize(String name) {
for (String prefix : prefixes()) {
if (Strings.isEmpty(prefix)) {
throw new IllegalStateException("prefix can't be empty");
}
Expand All @@ -74,7 +74,7 @@ private int metchSize(String name) {

protected void buildWhereClause(
StringBuilder tailOfSql, List<OpUnit> opUnits, List<String> logics,
CrudMeta cm, List<Type> parameterTypes, String methodName, Class<?> clazz) {
CrudMeta cm, List<Type> parameterTypes, String methodName, Class<?> className) {
if (opUnits.size() == 0) {
throw new IllegalStateException(); // TODO msg
}
Expand All @@ -98,7 +98,7 @@ protected void buildWhereClause(
Type propertyType = cm.getTypeByProperty(property);
if (column == null || propertyType == null) {
throw new CrudException("the name of method [" + methodName + "] is error, " +
"property " + property + " can't be found in '" + clazz + "'");
"property " + property + " can't be found in '" + className + "'");
}
Op op = opUnit.getOp();
String[] params = new String[op.paramCount()];
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/jfaster/mango/crud/named/factory/NamedCountBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
*/
public class NamedCountBuilderFactory extends AbstractNamedBuilderFactory {

private final static List<String> PREFIXS = new ArrayList<String>();
private static final List<String> PREFIXES = new ArrayList<String>();
static {
PREFIXS.add("countBy");
PREFIXES.add("countBy");
}

@Override
public List<String> prefixs() {
return PREFIXS;
public List<String> prefixes() {
return PREFIXES;
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jfaster/mango/crud/named/factory/NamedDeleteBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
*/
public class NamedDeleteBuilderFactory extends AbstractNamedBuilderFactory {

private final static List<String> PREFIXS = new ArrayList<String>();
private static final List<String> PREFIXES = new ArrayList<String>();
static {
PREFIXS.add("deleteBy");
PREFIXS.add("removeBy");
PREFIXES.add("deleteBy");
PREFIXES.add("removeBy");
}

@Override
public List<String> prefixs() {
return PREFIXS;
public List<String> prefixes() {
return PREFIXES;
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/org/jfaster/mango/crud/named/factory/NamedQueryBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
*/
public class NamedQueryBuilderFactory extends AbstractNamedBuilderFactory {

private final static List<String> PREFIXS = new ArrayList<String>();
private static final List<String> PREFIXES = new ArrayList<String>();
static {
PREFIXS.add("getBy");
PREFIXS.add("findBy");
PREFIXS.add("queryBy");
PREFIXS.add("selectBy");
PREFIXES.add("getBy");
PREFIXES.add("findBy");
PREFIXES.add("queryBy");
PREFIXES.add("selectBy");
}

@Override
public List<String> prefixs() {
return PREFIXS;
public List<String> prefixes() {
return PREFIXES;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jfaster/mango/datasource/AbstractDataSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
*/
public abstract class AbstractDataSourceFactory implements DataSourceFactory {

public final static String DEFULT_NAME = "DEFAULT";
public static final String DEFAULT_NAME = "DEFAULT";

private String name;

protected AbstractDataSourceFactory() {
this(DEFULT_NAME);
this(DEFAULT_NAME);
}

protected AbstractDataSourceFactory(String name) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jfaster/mango/operator/BatchUpdateOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ public Object execute(Object[] values) {
return transformer.transform(new int[]{});
}

Map<DataSource, Group> gorupMap = new HashMap<DataSource, Group>();
Map<DataSource, Group> groupMap = new HashMap<DataSource, Group>();
int t = 0;
for (Object obj : iterObj) {
InvocationContext context = invocationContextFactory.newInvocationContext(new Object[]{obj});
group(context, gorupMap, t++);
group(context, groupMap, t++);
}
int[] ints = executeDb(gorupMap, t);
int[] ints = executeDb(groupMap, t);
return transformer.transform(ints);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jfaster/mango/transaction/TransactionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public static Transaction newTransaction(String dataSourceFactoryName) {
}

public static Transaction newTransaction(TransactionIsolationLevel level) {
return newTransaction(AbstractDataSourceFactory.DEFULT_NAME, level);
return newTransaction(AbstractDataSourceFactory.DEFAULT_NAME, level);
}

public static Transaction newTransaction() {
return newTransaction(AbstractDataSourceFactory.DEFULT_NAME, TransactionIsolationLevel.DEFAULT);
return newTransaction(AbstractDataSourceFactory.DEFAULT_NAME, TransactionIsolationLevel.DEFAULT);
}

public static Transaction newTransaction(DataSource dataSource) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jfaster/mango/util/logging/FormattingTuple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ static Object[] trimmedCopy(Object[] argArray) {
if (argArray == null || argArray.length == 0) {
throw new IllegalStateException("non-sensical empty or null argument array");
}
final int trimemdLen = argArray.length - 1;
Object[] trimmed = new Object[trimemdLen];
System.arraycopy(argArray, 0, trimmed, 0, trimemdLen);
final int trimmedLen = argArray.length - 1;
Object[] trimmed = new Object[trimmedLen];
System.arraycopy(argArray, 0, trimmed, 0, trimmedLen);
return trimmed;
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jfaster/mango/jdbc/exception/BadSqlGrammarExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void before() throws Exception {
public void test() {
thrown.expect(BadSqlGrammarException.class);
JdbcTemplate t = new JdbcTemplate();
BoundSql boundSql = new BoundSql(new StringBuilder("insert intoo .."));
BoundSql boundSql = new BoundSql(new StringBuilder("insert into .."));
t.update(ds, boundSql);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jfaster/mango/support/MockDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
public class MockDB implements Annotation, DB {

private String name = AbstractDataSourceFactory.DEFULT_NAME;
private String name = AbstractDataSourceFactory.DEFAULT_NAME;

private String table = "";

Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/jfaster/mango/transaction/TransactionTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ public void testCommit() throws Exception {
dao.insert(y);
dao.insert(z);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {
@Override
public void doInTransaction(TransactionStatus status) {
x.add(50);
dao.update(x);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
Expand Down Expand Up @@ -96,17 +96,17 @@ public void testRollback() throws Exception {
dao.insert(y);
dao.insert(z);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {
@Override
public void doInTransaction(TransactionStatus status) {
x.add(50);
dao.update(x);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
Expand Down Expand Up @@ -141,17 +141,17 @@ public void testRollback2() throws Exception {
dao.insert(y);
dao.insert(z);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {
@Override
public void doInTransaction(TransactionStatus status) {
x.add(50);
dao.update(x);

TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFULT_NAME, new TransactionAction() {
TransactionTemplate.execute(mango, AbstractDataSourceFactory.DEFAULT_NAME, new TransactionAction() {

@Override
public void doInTransaction(TransactionStatus status) {
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/jfaster/mango/transaction/TransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void testCommit() throws Exception {
x.add(num);
y.sub(num);
TransactionIsolationLevel level = TransactionIsolationLevel.SERIALIZABLE;
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME, level);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME, level);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);
assertThat(connHolder, notNullValue());
assertThat(connHolder.getConnection(), notNullValue());
Expand Down Expand Up @@ -100,7 +100,7 @@ public void testRollback() throws Exception {
x.add(num);
y.sub(num);
TransactionIsolationLevel level = TransactionIsolationLevel.SERIALIZABLE;
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME, level);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME, level);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);
assertThat(connHolder, notNullValue());
assertThat(connHolder.getConnection(), notNullValue());
Expand Down Expand Up @@ -136,7 +136,7 @@ public void testRollback2() throws Exception {
x.add(num);
y.sub(num);
TransactionIsolationLevel level = TransactionIsolationLevel.SERIALIZABLE;
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME, level);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME, level);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);
assertThat(connHolder, notNullValue());
assertThat(connHolder.getConnection(), notNullValue());
Expand All @@ -163,7 +163,7 @@ public void testCommitEmpty() throws Exception {
int previousLevel = getPreviousLevel();

TransactionIsolationLevel level = TransactionIsolationLevel.SERIALIZABLE;
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME, level);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME, level);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);
assertThat(connHolder, notNullValue());
assertThat(connHolder.getConnection(), notNullValue());
Expand All @@ -183,7 +183,7 @@ public void testRollbackEmpty() throws Exception {
int previousLevel = getPreviousLevel();

TransactionIsolationLevel level = TransactionIsolationLevel.SERIALIZABLE;
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME, level);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME, level);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);
assertThat(connHolder, notNullValue());
assertThat(connHolder.getConnection(), notNullValue());
Expand All @@ -209,7 +209,7 @@ public void testDefaultLevel() throws Exception {
x.add(num);
y.sub(num);

Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFULT_NAME);
Transaction tx = TransactionFactory.newTransaction(mango, AbstractDataSourceFactory.DEFAULT_NAME);
ConnectionHolder connHolder = TransactionSynchronizationManager.getConnectionHolder(ds);

dao.update(x);
Expand Down