From 398eaf6f1068e0e53a21e49e6f91f5d308fd291f Mon Sep 17 00:00:00 2001
From: "Redhuan D. Oon" <red1@red1.org>
Date: Thu, 25 Feb 2010 21:08:04 +0000
Subject: [PATCH] FR: [ 2214883 ] Remove SQL code and Replace for Query (thanks
 Trifon for the last review and correction.  -- JUnit test included (no
 failures)

---
 base/src/org/compiere/model/MProductBOM.java  | 37 ++++-------------
 .../src/test/functional/MProductBOMTest.java  | 40 +++++++++++++++++++
 2 files changed, 48 insertions(+), 29 deletions(-)
 create mode 100644 extend/src/test/functional/MProductBOMTest.java

diff --git a/base/src/org/compiere/model/MProductBOM.java b/base/src/org/compiere/model/MProductBOM.java
index fae68f4e83..3434073199 100644
--- a/base/src/org/compiere/model/MProductBOM.java
+++ b/base/src/org/compiere/model/MProductBOM.java
@@ -19,6 +19,7 @@ package org.compiere.model;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
@@ -62,35 +63,13 @@ public class MProductBOM extends X_M_Product_BOM
 	 */
 	public static MProductBOM[] getBOMLines (Properties ctx, int M_Product_ID, String trxName)
 	{
-		String sql = "SELECT * FROM M_Product_BOM WHERE M_Product_ID=? ORDER BY Line";
-		ArrayList<MProductBOM> list = new ArrayList<MProductBOM>();
-		PreparedStatement pstmt = null;
-		try
-		{
-			pstmt = DB.prepareStatement(sql, trxName);
-			pstmt.setInt(1, M_Product_ID);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-				list.add(new MProductBOM (ctx, rs, trxName));
-			rs.close();
-			pstmt.close();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			s_log.log(Level.SEVERE, sql, e);
-		}
-		try
-		{
-			if (pstmt != null)
-				pstmt.close();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
-		}
-		//
+ 		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
+		String whereClause = "M_Product_ID=?";
+		List <MProductBOM> list = new Query(ctx, MProductBOM.Table_Name, whereClause, trxName)
+		.setParameters(new Object[]{M_Product_ID})
+		.setOrderBy("Line")
+		.list();
+ 
 	//	s_log.fine("getBOMLines - #" + list.size() + " - M_Product_ID=" + M_Product_ID);
 		MProductBOM[] retValue = new MProductBOM[list.size()];
 		list.toArray(retValue);
diff --git a/extend/src/test/functional/MProductBOMTest.java b/extend/src/test/functional/MProductBOMTest.java
new file mode 100644
index 0000000000..fbaad90298
--- /dev/null
+++ b/extend/src/test/functional/MProductBOMTest.java
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 SC ARHIPAC SERVICE SRL. All Rights Reserved.            *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package test.functional;
+
+import org.compiere.model.MProductBOM;
+import org.compiere.util.Env;
+
+import test.AdempiereTestCase;
+
+/**
+ * @author Teo Sarca, www.arhipac.ro // used by red1
+ */
+public class MProductBOMTest extends AdempiereTestCase
+{
+ 	
+	@Override
+	protected void setUp() throws Exception
+	{
+		super.setUp();
+		assertEquals("Client is not GardenWorld", 11, Env.getAD_Client_ID(getCtx()));
+	}
+	
+	public void testQuery() throws Exception
+	{
+		MProductBOM[] lines = MProductBOM.getBOMLines(getCtx(), 145, getTrxName());
+	 	assertTrue("ProductBOM should have lines", lines.length > 0);
+	}
+
+}