OSDN > 浏览软件 > Software Development > Amateras > SCM > SVN > 提交

Amateras

R/O
SSH
HTTPS

amateras: 提交

Commit MetaInfo

修订版	614 (tree)
时间	2011-11-12 09:02:53
作者	daisuke_m

Log Message

avoid numeric constant fields.
Instead using enum.

更改概述

modified: mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManagerImpl.java (diff)
modified: mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizerImpl.java (diff)
modified: mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizer.java (diff)
modified: mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlParserImpl.java (diff)
modified: mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManager.java (diff)

差异

--- mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManagerImpl.java (revision 613)

+++ mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManagerImpl.java (revision 614)

		@@ -362,6 +362,14 @@
362	362	}
363	363	return result.intValue();
364	364	}
	365	+
	366	+ public int getCountBySql(String sql) {
	367	+ return getCountBySql(sql, new Object[0]);
	368	+ }
	369	+
	370	+ public int getCountBySql(String sql, Object... params) {
	371	+ return getSingleResultBySql(Integer.class, sql, params);
	372	+ }
365	373
366	374	// @Override
367	375	public <T, R> R iterate(Class<T> clazz, IterationCallback<T, R> callback, String sqlPath) {

--- mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizerImpl.java (revision 613)

+++ mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizerImpl.java (revision 614)

		@@ -32,9 +32,9 @@
32	32
33	33	private String token;
34	34
35		- private int tokenType = SQL;
	35	+ private TokenType tokenType = TokenType.SQL;
36	36
37		- private int nextTokenType = SQL;
	37	+ private TokenType nextTokenType = TokenType.SQL;
38	38
39	39	private int bindVariableNum = 0;
40	40

		@@ -73,21 +73,21 @@
73	73	}
74	74
75	75	// @Override
76		- public int getTokenType() {
	76	+ public TokenType getTokenType() {
77	77	return tokenType;
78	78	}
79	79
80	80	// @Override
81		- public int getNextTokenType() {
	81	+ public TokenType getNextTokenType() {
82	82	return nextTokenType;
83	83	}
84	84
85	85	// @Override
86		- public int next() {
	86	+ public TokenType next() {
87	87	if (position >= sql.length()) {
88	88	token = null;
89		- tokenType = EOF;
90		- nextTokenType = EOF;
	89	+ tokenType = TokenType.EOF;
	90	+ nextTokenType = TokenType.EOF;
91	91	return tokenType;
92	92	}
93	93	switch (nextTokenType) {

		@@ -135,21 +135,21 @@
135	135	elseCommentStartPos, bindVariableStartPos);
136	136	if (nextStartPos < 0) {
137	137	token = sql.substring(position);
138		- nextTokenType = EOF;
	138	+ nextTokenType = TokenType.EOF;
139	139	position = sql.length();
140		- tokenType = SQL;
	140	+ tokenType = TokenType.SQL;
141	141	} else {
142	142	token = sql.substring(position, nextStartPos);
143		- tokenType = SQL;
	143	+ tokenType = TokenType.SQL;
144	144	boolean needNext = nextStartPos == position;
145	145	if (nextStartPos == commentStartPos) {
146		- nextTokenType = COMMENT;
	146	+ nextTokenType = TokenType.COMMENT;
147	147	position = commentStartPos + 2;
148	148	} else if (nextStartPos == elseCommentStartPos) {
149		- nextTokenType = ELSE;
	149	+ nextTokenType = TokenType.ELSE;
150	150	position = elseCommentStartPos + elseCommentLength;
151	151	} else if (nextStartPos == bindVariableStartPos) {
152		- nextTokenType = BIND_VARIABLE;
	152	+ nextTokenType = TokenType.BIND_VARIABLE;
153	153	position = bindVariableStartPos;
154	154	}
155	155	if (needNext) {

		@@ -201,9 +201,9 @@
201	201	"%s is not closed with %s.", sql.substring(position), "*/"));
202	202	}
203	203	token = sql.substring(position, commentEndPos);
204		- nextTokenType = SQL;
	204	+ nextTokenType = TokenType.SQL;
205	205	position = commentEndPos + 2;
206		- tokenType = COMMENT;
	206	+ tokenType = TokenType.COMMENT;
207	207	}
208	208
209	209	/**

		@@ -211,9 +211,9 @@
211	211	*/
212	212	protected void parseBindVariable() {
213	213	token = nextBindVariableName();
214		- nextTokenType = SQL;
	214	+ nextTokenType = TokenType.SQL;
215	215	position += 1;
216		- tokenType = BIND_VARIABLE;
	216	+ tokenType = TokenType.BIND_VARIABLE;
217	217	}
218	218
219	219	/**

		@@ -221,8 +221,8 @@
221	221	*/
222	222	protected void parseElse() {
223	223	token = null;
224		- nextTokenType = SQL;
225		- tokenType = ELSE;
	224	+ nextTokenType = TokenType.SQL;
	225	+ tokenType = TokenType.ELSE;
226	226	}
227	227
228	228	/**

		@@ -230,8 +230,8 @@
230	230	*/
231	231	protected void parseEof() {
232	232	token = null;
233		- tokenType = EOF;
234		- nextTokenType = EOF;
	233	+ tokenType = TokenType.EOF;
	234	+ nextTokenType = TokenType.EOF;
235	235	}
236	236
237	237	/**

		@@ -275,8 +275,8 @@
275	275	}
276	276	}
277	277	token = sql.substring(position, index);
278		- tokenType = SQL;
279		- nextTokenType = SQL;
	278	+ tokenType = TokenType.SQL;
	279	+ nextTokenType = TokenType.SQL;
280	280	position = index;
281	281	return token;
282	282	}

--- mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizer.java (revision 613)

+++ mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlTokenizer.java (revision 614)

		@@ -25,27 +25,42 @@
25	25
26	26	/**
27	27	* SQL
	28	+ *
	29	+ * @deprecated use {@link TokenType#SQL}
28	30	*/
	31	+ @Deprecated
29	32	int SQL = 1;
30	33
31	34	/**
32	35	* COMMENT
	36	+ *
	37	+ * @deprecated use {@link TokenType#COMMENT}
33	38	*/
	39	+ @Deprecated
34	40	int COMMENT = 2;
35	41
36	42	/**
37	43	* ELSE
	44	+ *
	45	+ * @deprecated use {@link TokenType#ELSE}
38	46	*/
	47	+ @Deprecated
39	48	int ELSE = 3;
40	49
41	50	/**
42	51	* BIND_VARIABLE
	52	+ *
	53	+ * @deprecated use {@link TokenType#BIND_VARIABLE}
43	54	*/
	55	+ @Deprecated
44	56	int BIND_VARIABLE = 4;
45	57
46	58	/**
47	59	* EOF
	60	+ *
	61	+ * @deprecated use {@link TokenType#EOF}
48	62	*/
	63	+ @Deprecated
49	64	int EOF = 99;
50	65
51	66	/**

		@@ -88,7 +103,7 @@
88	103	*
89	104	* @return
90	105	*/
91		- int getTokenType();
	106	+ TokenType getTokenType();
92	107
93	108	/**
94	109	* 次のトークン種別を返します。

		@@ -95,7 +110,7 @@
95	110	*
96	111	* @return
97	112	*/
98		- int getNextTokenType();
	113	+ TokenType getNextTokenType();
99	114
100	115	/**
101	116	* 次のトークンに進みます。

		@@ -102,7 +117,7 @@
102	117	*
103	118	* @return
104	119	*/
105		- int next();
	120	+ TokenType next();
106	121
107	122	/**
108	123	* トークンをスキップします。

		@@ -117,4 +132,16 @@
117	132	* @return
118	133	*/
119	134	String skipWhitespace();
	135	+
	136	+ public enum TokenType {
	137	+ SQL,
	138	+
	139	+ COMMENT,
	140	+
	141	+ ELSE,
	142	+
	143	+ BIND_VARIABLE,
	144	+
	145	+ EOF
	146	+ }
120	147	}
		\ No newline at end of file

--- mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlParserImpl.java (revision 613)

+++ mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/parser/SqlParserImpl.java (revision 614)

		@@ -18,6 +18,7 @@
18	18	import java.util.Stack;
19	19
20	20	import jp.sf.amateras.mirage.exception.TwoWaySQLException;
	21	+import jp.sf.amateras.mirage.parser.SqlTokenizer.TokenType;
21	22	import jp.sf.amateras.mirage.util.StringUtil;
22	23
23	24	/**

		@@ -48,7 +49,7 @@
48	49	// @Override
49	50	public Node parse() {
50	51	push(new ContainerNode());
51		- while (SqlTokenizer.EOF != tokenizer.next()) {
	52	+ while (TokenType.EOF != tokenizer.next()) {
52	53	parseToken();
53	54	}
54	55	return pop();

		@@ -59,16 +60,16 @@
59	60	*/
60	61	protected void parseToken() {
61	62	switch (tokenizer.getTokenType()) {
62		- case SqlTokenizer.SQL:
	63	+ case SQL:
63	64	parseSql();
64	65	break;
65		- case SqlTokenizer.COMMENT:
	66	+ case COMMENT:
66	67	parseComment();
67	68	break;
68		- case SqlTokenizer.ELSE:
	69	+ case ELSE:
69	70	parseElse();
70	71	break;
71		- case SqlTokenizer.BIND_VARIABLE:
	72	+ case BIND_VARIABLE:
72	73	parseBindVariable();
73	74	break;
74	75	}

		@@ -155,8 +156,8 @@
155	156	* ENDを解析します。
156	157	*/
157	158	protected void parseEnd() {
158		- while (SqlTokenizer.EOF != tokenizer.next()) {
159		- if (tokenizer.getTokenType() == SqlTokenizer.COMMENT
	159	+ while (TokenType.EOF != tokenizer.next()) {
	160	+ if (tokenizer.getTokenType() == TokenType.COMMENT
160	161	&& isEndComment(tokenizer.getToken())) {
161	162
162	163	pop();

--- mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManager.java (revision 613)

+++ mirage/trunk/mirage/src/main/java/jp/sf/amateras/mirage/SqlManager.java (revision 614)

		@@ -69,7 +69,11 @@
69	69	* @return the row count
70	70	*/
71	71	public int getCount(String sqlPath, Object param);
	72	+
	73	+ public int getCountBySql(String sql);
72	74
	75	+ public int getCountBySql(String sql, Object... params);
	76	+
73	77	public <T> List<T> getResultList(Class<T> clazz, String sqlPath);
74	78
75	79	public <T> List<T> getResultList(Class<T> clazz, String sqlPath, Object param);

Show on old repository browser