Return-Path: X-Original-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 443E486CB for ; Tue, 16 Aug 2011 13:09:42 +0000 (UTC) Received: (qmail 55731 invoked by uid 500); 16 Aug 2011 13:09:42 -0000 Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org Received: (qmail 55707 invoked by uid 500); 16 Aug 2011 13:09:41 -0000 Mailing-List: contact empire-db-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@incubator.apache.org Delivered-To: mailing list empire-db-commits@incubator.apache.org Received: (qmail 55699 invoked by uid 99); 16 Aug 2011 13:09:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 13:09:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 13:09:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 89C172388847; Tue, 16 Aug 2011 13:09:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1158258 - in /incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample: client/ common/ server/ Date: Tue, 16 Aug 2011 13:09:17 -0000 To: empire-db-commits@incubator.apache.org From: francisdb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110816130917.89C172388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: francisdb Date: Tue Aug 16 13:09:16 2011 New Revision: 1158258 URL: http://svn.apache.org/viewvc?rev=1158258&view=rev Log: EMPIREDB-99 Refactor cxf example for new error handling Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeServiceClient.java incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/common/EmployeeService.java incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/EmployeeServiceImpl.java incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeServiceClient.java URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeServiceClient.java?rev=1158258&r1=1158257&r2=1158258&view=diff ============================================================================== --- incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeServiceClient.java (original) +++ incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeServiceClient.java Tue Aug 16 13:09:16 2011 @@ -60,19 +60,18 @@ public class EmployeeServiceClient return service.getEmmployee(id); } - public boolean saveEmployee(Employee e) + public void saveEmployee(Employee e) { // Employee is here a INOUT parameter, and therfore has to be placed in a Holder. Holder holder = new Holder(e); - boolean retVal = service.saveEmmployee(holder); + service.saveEmmployee(holder); // In order to retrieve changes made by the webservice we copy the content to our local variable. e.set(holder.value); - return retVal; } - public boolean deleteEmployee(int id) + public void deleteEmployee(int id) { - return service.deleteEmmployee(id); + service.deleteEmmployee(id); } public List searchEmployee(Integer id, String firstName, String lastName, Integer department) Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/common/EmployeeService.java URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/common/EmployeeService.java?rev=1158258&r1=1158257&r2=1158258&view=diff ============================================================================== --- incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/common/EmployeeService.java (original) +++ incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/common/EmployeeService.java Tue Aug 16 13:09:16 2011 @@ -23,9 +23,9 @@ import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; +import javax.jws.WebParam.Mode; import javax.jws.WebResult; import javax.jws.WebService; -import javax.jws.WebParam.Mode; import javax.xml.ws.Holder; //specifies the the attribute wsdl:portType @@ -50,11 +50,11 @@ public interface EmployeeService @WebMethod(operationName = "saveEmmployee") @WebResult(name = "saveResponse") - public boolean saveEmmployee(@WebParam(name = "employee", mode = Mode.INOUT) Holder e); + public void saveEmmployee(@WebParam(name = "employee", mode = Mode.INOUT) Holder e); @WebMethod(operationName = "deleteEmmployee") @WebResult(name = "deleteResponse") - public boolean deleteEmmployee(@WebParam(name = "id", mode = Mode.IN) int id); + public void deleteEmmployee(@WebParam(name = "id", mode = Mode.IN) int id); @WebMethod(operationName = "getDepartments") @WebResult(name = "allDepartments") Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/EmployeeServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/EmployeeServiceImpl.java?rev=1158258&r1=1158257&r2=1158258&view=diff ============================================================================== --- incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/EmployeeServiceImpl.java (original) +++ incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/EmployeeServiceImpl.java Tue Aug 16 13:09:16 2011 @@ -55,26 +55,22 @@ public class EmployeeServiceImpl impleme T_EMP = db.EMPLOYEES; } - public boolean saveEmmployee(javax.xml.ws.Holder empHolder) + public void saveEmmployee(javax.xml.ws.Holder empHolder) { DBRecord r = new DBRecord(); Employee emp = empHolder.value; boolean init; if (emp.isNew()) - init = r.create(T_EMP, conn); + r.create(T_EMP, conn); else - init = r.read(T_EMP, emp.getEmployeeId(), conn); + r.read(T_EMP, emp.getEmployeeId(), conn); - boolean fill = r.setBeanValues(emp); - boolean save = r.update(conn); + r.setBeanValues(emp); + r.update(conn); - if (init && fill && save) - { - r.getBeanProperties(emp); - emp.setNew(false); - } - return init && fill && save; + r.getBeanProperties(emp); + emp.setNew(false); } public List searchEmmployee(Integer id, String firstName, String lastName, Integer department) @@ -128,17 +124,17 @@ public class EmployeeServiceImpl impleme Employee emp = new Employee(); // null, so that no IDs are wasted. - boolean create = r.create(T_EMP, null); - boolean fill = r.getBeanProperties(emp); + r.create(T_EMP, null); + r.getBeanProperties(emp); emp.setNew(true); - return (create && fill ? emp : null); + return emp; } - public boolean deleteEmmployee(int id) + public void deleteEmmployee(int id) { - return T_EMP.deleteRecord(id, conn); + T_EMP.deleteRecord(id, conn); } public Employee getEmmployee(int id) @@ -146,10 +142,9 @@ public class EmployeeServiceImpl impleme DBRecord r = new DBRecord(); Employee emp = new Employee(); - boolean read = r.read(T_EMP, id, conn); - boolean fill = r.getBeanProperties(emp); - - return (read && fill ? emp : null); + r.read(T_EMP, id, conn); + r.getBeanProperties(emp); + return emp; } public boolean ping() Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java?rev=1158258&r1=1158257&r2=1158258&view=diff ============================================================================== --- incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java (original) +++ incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java Tue Aug 16 13:09:16 2011 @@ -41,15 +41,13 @@ public class SampleConfig extends XMLCon * * @return true on success */ - public boolean init(String filename) { + public void init(String filename) { // Read the properties file - if (super.init(filename, false) == false) - return false; + super.init(filename, false); // Done - if (readProperties(this, "properties")==false) - return false; + readProperties(this, "properties"); // Reader Provider Properties - return readProperties(this, "properties-" + databaseProvider); + readProperties(this, "properties-" + databaseProvider); } public String getDatabaseProvider() { Modified: incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java?rev=1158258&r1=1158257&r2=1158258&view=diff ============================================================================== --- incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java (original) +++ incubator/empire-db/branches/EMPIREDB-99/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java Tue Aug 16 13:09:16 2011 @@ -117,7 +117,8 @@ public class ServerControl // Open Database (and create if not existing) log.info("*** open database ***"); - if (!db.open(driver, conn) || !databaseExists(conn)) + db.open(driver, conn); + if (!databaseExists(conn)) { // STEP 4: Create Database log.info("*** create Database ***"); @@ -231,8 +232,8 @@ public class ServerControl script.run(driver, conn, false); db.commit(conn); // Open again - if (!db.isOpen() && !db.open(driver, conn)){ - throw new RuntimeException(driver.getErrorMessage()); + if (!db.isOpen()){ + db.open(driver, conn); } // Insert Sample Departments int idDevDep = insertDepartmentSampleRecord(conn, "Development", "ITTK"); @@ -255,11 +256,7 @@ public class ServerControl rec.create(db.DEPARTMENTS); rec.setValue(db.DEPARTMENTS.NAME, department_name); rec.setValue(db.DEPARTMENTS.BUSINESS_UNIT, businessUnit); - if (!rec.update(conn)) - { - log.error(rec.getErrorMessage()); - return 0; - } + rec.update(conn); // Return Department ID return rec.getInt(db.DEPARTMENTS.DEPARTMENT_ID); } @@ -278,11 +275,7 @@ public class ServerControl rec.setValue(db.EMPLOYEES.LASTNAME, lastName); rec.setValue(db.EMPLOYEES.GENDER, gender); rec.setValue(db.EMPLOYEES.DEPARTMENT_ID, depID); - if (!rec.update(conn)) - { - log.error(rec.getErrorMessage()); - return 0; - } + rec.update(conn); // Return Employee ID return rec.getInt(db.EMPLOYEES.EMPLOYEE_ID); }