Skip to content

Commit 5857754

Browse files
committed
#374 Undeprecate Db.find(), Base.find() and RowProcessor
1 parent 73c386b commit 5857754

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

activejdbc/src/main/java/org/javalite/activejdbc/Base.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ public void onNext(Map row) {
225225
* @param query raw SQL.
226226
* @param params list of parameters if query is parametrized.
227227
* @return instance of <code>RowProcessor</code> which has with() method for convenience.
228-
* @deprecated use {@link #findWith(ResultSetListener, boolean, String, Object...)} instead
229228
*/
230-
@Deprecated
231229
public static RowProcessor find(String query, Object... params) {
232230
return new DB(DB.DEFAULT_NAME).find(query, params);
233231
}
@@ -264,9 +262,7 @@ public static void findWith(ResultSetListener listener, boolean streaming, Strin
264262
*
265263
* @param sql raw SQL query.
266264
* @param listener client listener implementation for processing individual rows.
267-
* @deprecated use {@link #findWith(ResultSetListener, boolean, String)} instead
268265
*/
269-
@Deprecated
270266
public static void find(String sql, RowListener listener) {
271267
new DB(DB.DEFAULT_NAME).find(sql, listener);
272268
}

activejdbc/src/main/java/org/javalite/activejdbc/DB.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,7 @@ public void onNext(Map row) {
450450
* @param query raw SQL.
451451
* @param params list of parameters if query is parametrized.
452452
* @return instance of <code>RowProcessor</code> which has with() method for convenience.
453-
* @deprecated use {@link #findWith(ResultSetListener, boolean, String, Object...)} instead
454453
*/
455-
@Deprecated
456454
public RowProcessor find(String query, Object... params) {
457455
if(query.indexOf('?') == -1 && params.length != 0) throw new IllegalArgumentException("you passed arguments, but the query does not have placeholders: (?)");
458456

@@ -526,9 +524,7 @@ private PreparedStatement prepareStreamingStatement(String query) throws SQLExce
526524
*
527525
* @param sql raw SQL query.
528526
* @param listener client listener implementation for processing individual rows.
529-
* @deprecated use {@link #findWith(ResultSetListener, boolean, String)} instead
530527
*/
531-
@Deprecated
532528
public void find(String sql, RowListener listener) {
533529
findWith(listener, true, sql);
534530
}

activejdbc/src/main/java/org/javalite/activejdbc/RowProcessor.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import static org.javalite.common.Util.*;
2323

24-
@Deprecated
24+
//TODO: this class does nothing relevant anymore, since ResultSetListener was introduced
2525
public class RowProcessor {
2626
private final ResultSet rs;
2727
private final Statement s;
@@ -31,10 +31,6 @@ protected RowProcessor(ResultSet rs, Statement s){
3131
this.s = s;
3232
}
3333

34-
/**
35-
* @deprecated use {@link DB#findWith(ResultSetListener, boolean, String, Object...)}
36-
*/
37-
@Deprecated
3834
public void with(RowListener listener) {
3935
try {
4036
listener.onResultSet(rs);

0 commit comments

Comments
 (0)