Displaying differences for changeset
 
display as  

src/java/m/wqm/ipmscoresfull/V1_0.java

@@ -22,8 +22,7 @@
 import static wqm.utils.DBResources.WQM_ID;
 
 @Name("WQM-24: IPM Scores")
-@Description("This service returns all rows and columns "
-        + "from the wqm_ipm_scores table.")
+@Description("This service returns all rows and columns from the wqm_ipm_scores table.")
 @Path("m/ipmscoresfull/1.0")
 @Resource(from = DBResources.class)
 
@@ -32,10 +31,6 @@
     private ArrayList<m.wqm.ipmscoresfull.V1_0.Result1> result1;
 
     @Override
-    protected void preProcess() {
-    }
-
-    @Override
     protected void doProcess() throws Exception {
         this.result1 = new ArrayList<>();
 

src/java/m/wqm/pestipmscoresfull/V1_0.java

@@ -4,7 +4,6 @@
 package m.wqm.pestipmscoresfull;
 
 import csip.ModelDataService;
-import static csip.ModelDataService.EXEC_OK;
 import csip.ServiceException;
 import csip.annotations.Resource;
 import java.util.ArrayList;
@@ -12,11 +11,11 @@
 import oms3.annotations.Description;
 import oms3.annotations.Name;
 import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONObject;
 import csip.utils.JSONUtils;
-import java.util.Map;
-import java.sql.*;
-import java.util.concurrent.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.logging.Level;
 import org.codehaus.jettison.json.JSONException;
 import wqm.utils.DBResources;
@@ -29,39 +28,33 @@
 
 public class V1_0 extends ModelDataService {
 
-    int ipm_practice_score_id;
-    int practice_id;
-    int ipm_practice_score;
-    String practice_code;
-    String ipm_practice_name;
-    String practice_variant;
-    String wqm_concern;
-
-    ArrayList<Result1> result1 = new ArrayList<>();
+    private ArrayList<m.wqm.pestipmscoresfull.V1_0.Result1> result1;
 
     @Override
     protected void doProcess() throws Exception {
+        result1 = new ArrayList<>();
         try (Connection conn = getResourceJDBC(WQM_ID);
                 Statement statement = conn.createStatement()) {
 
-            String query = "SELECT * FROM wqm_ipm_practice_scores"; // We need to return the entire table, so we use the not standard SELECT * 
+            String query = "SELECT * FROM wqm.wqm_ipm_practice_scores";
             try (ResultSet results = statement.executeQuery(query)) {
                 while (results.next()) {
-                    ipm_practice_score_id = results.getInt("ipm_practice_score_id");
-                    practice_id = results.getInt("practice_id");
-                    ipm_practice_score = results.getInt("ipm_practice_score");
-                    practice_code = results.getString("practice_code");
-                    ipm_practice_name = results.getString("ipm_practice_name");
-                    practice_variant = results.getString("practice_variant");
-                    wqm_concern = results.getString("wqm_concern");
+                    int ipm_practice_score_id = results.getInt("ipm_practice_score_id");
+                    int practice_id = results.getInt("practice_id");
+                    int ipm_practice_score = results.getInt("ipm_practice_score");
+                    String practice_code = results.getString("practice_code");
+                    String ipm_practice_name = results.getString("ipm_practice_name");
+                    String practice_variant = results.getString("practice_variant");
+                    String wqm_concern = results.getString("wqm_concern");
 
-                    result1.add(new Result1(ipm_practice_score_id, practice_id, ipm_practice_score, practice_code, ipm_practice_name, practice_variant, wqm_concern));
-
+                    result1.add(new m.wqm.pestipmscoresfull.V1_0.Result1(ipm_practice_score_id,
+                            practice_id, ipm_practice_score, practice_code, ipm_practice_name,
+                            practice_variant, wqm_concern));
                 }
             }
 
         } catch (SQLException se) {
-            LOG.log(Level.SEVERE, "Did not open database for WQM-24!", se);
+            LOG.log(Level.SEVERE, "Did not open database for WQM-26!", se);
             throw new ServiceException("SQL problem", se);
         }
 
@@ -70,22 +63,27 @@
     @Override
     //writing the results back to JSON
     protected void postProcess() throws Exception {
-        JSONArray result1Arr = new JSONArray();
-        for (V1_0.Result1 rs1 : result1) {
-            JSONArray tmpArr = new JSONArray();
-            tmpArr.put(JSONUtils.dataDesc("ipm_practice_score_id", rs1.ipm_practice_score_id, "ipm_practice_score_id"));
-            tmpArr.put(JSONUtils.dataDesc("practice_id", rs1.practice_id, "NRCS conservation practice identifier"));
-            tmpArr.put(JSONUtils.dataDesc("ipm_practice_score", rs1.ipm_practice_score, "ipm_practice_score"));
-            tmpArr.put(JSONUtils.dataDesc("practice_code", rs1.practice_code, "NRCS conservation practice code"));
-            tmpArr.put(JSONUtils.dataDesc("ipm_practice_name", rs1.ipm_practice_name, "Name of NRCS conservation practice used for integrated pest management"));
-            tmpArr.put(JSONUtils.dataDesc("practice_variant", rs1.practice_variant, "Variant of NRCS conservation practice used for integrated pest management, usually relating to purpose"));
-            tmpArr.put(JSONUtils.dataDesc("wqm_concern", rs1.wqm_concern, "WQM resource concern:  pesticide leaching, pesticide solution runoff, pesticide adsorbed runoff, pesticide drift"));
-            result1Arr.put(JSONUtils.dataDesc("IPM practice Scores", tmpArr, "IPMPracticeScores"));
+        try {
+            JSONArray result1Arr = new JSONArray();
+            for (m.wqm.pestipmscoresfull.V1_0.Result1 rs1 : result1) {
+                JSONArray tmpArr = new JSONArray();
+                tmpArr.put(JSONUtils.dataDesc("ipm_practice_score_id", rs1.ipm_practice_score_id, "ipm_practice_score_id"));
+                tmpArr.put(JSONUtils.dataDesc("practice_id", rs1.practice_id, "NRCS conservation practice identifier"));
+                tmpArr.put(JSONUtils.dataDesc("ipm_practice_score", rs1.ipm_practice_score, "ipm_practice_score"));
+                tmpArr.put(JSONUtils.dataDesc("practice_code", rs1.practice_code, "NRCS conservation practice code"));
+                tmpArr.put(JSONUtils.dataDesc("ipm_practice_name", rs1.ipm_practice_name, "Name of NRCS conservation practice used for integrated pest management"));
+                tmpArr.put(JSONUtils.dataDesc("practice_variant", rs1.practice_variant, "Variant of NRCS conservation practice used for integrated pest management, usually relating to purpose"));
+                tmpArr.put(JSONUtils.dataDesc("wqm_concern", rs1.wqm_concern, "WQM resource concern:  pesticide leaching, pesticide solution runoff, pesticide adsorbed runoff, pesticide drift"));
+                result1Arr.put(JSONUtils.dataDesc("IPM practice Scores", tmpArr, "IPMPracticeScores"));
+            }
+            putResult("operation", result1Arr);
+        } catch (JSONException ex) {
+            LOG.log(Level.SEVERE, "Error in processing the response JSON for WQM-26!", ex);
+            throw new ServiceException("Error in processing the response JSON.", ex);
         }
-        putResult("operation", result1Arr);
     }
 
-    public class Result1 {
+    static class Result1 {
 
         int ipm_practice_score_id;
         int practice_id;

src/java/m/wqm/pestipmscoresfull/V1_0.json

@@ -1,6 +1,5 @@
 {
-  "metainfo": {},
-  "parameter": [
-
-  ]
+    "metainfo": {},
+    "parameter": [
+    ]
 }
\ No newline at end of file