Displaying differences for changeset
 
display as  

src/java/m/wqm/sednutpractscoresfull/V1_0.java

@@ -4,7 +4,6 @@
  * @author anvesh
  */
 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,31 @@
 
 public class V1_0 extends ModelDataService {
 
-    int AoAId;
-    int nut_pract_score;
-    int nutrient_practice_score_id;
-    int practice_id;
-    String practice_code;
-    String conservation_practice;
-    String wqm_concern;
-    String mode_of_action;
-    String pract_discrim_type;
-    String min_pract_discrim;
-    String max_pract_discrim;
-    ArrayList<V1_0.Result1> result1 =new ArrayList<>();;
+    ArrayList<m.wqm.sednutpractscoresfull.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_sediment_nutrient_practice_scores"; // We need to return the entire table, so we use the non standard SELECT * 
+            String query = "SELECT * FROM wqm.wqm_sediment_nutrient_practice_scores";
 
             try (ResultSet results = statement.executeQuery(query)) {
                 while (results.next()) {
-                    nut_pract_score = results.getInt("nut_pract_score");
-                    nutrient_practice_score_id = results.getInt("nutrient_practice_score_id");
-                    practice_id = results.getInt("practice_id");
-                    practice_code = results.getString("practice_code");
-                    conservation_practice = results.getString("conservation_practice");
-                    wqm_concern = results.getString("wqm_concern");
-                    mode_of_action = results.getString("mode_of_action");
-                    pract_discrim_type = results.getString("pract_discrim_type");
-                    min_pract_discrim = results.getString("min_pract_discrim");
-                    max_pract_discrim = results.getString("max_pract_discrim");
+                    int nut_pract_score = results.getInt("nut_pract_score");
+                    int nutrient_practice_score_id = results.getInt("nutrient_practice_score_id");
+                    int practice_id = results.getInt("practice_id");
+                    String practice_code = results.getString("practice_code");
+                    String conservation_practice = results.getString("conservation_practice");
+                    String wqm_concern = results.getString("wqm_concern");
+                    String mode_of_action = results.getString("mode_of_action");
+                    String pract_discrim_type = results.getString("pract_discrim_type");
+                    String min_pract_discrim = results.getString("min_pract_discrim");
+                    String max_pract_discrim = results.getString("max_pract_discrim");
 
-                    result1.add(new Result1(nut_pract_score, nutrient_practice_score_id, practice_id, practice_code, conservation_practice, wqm_concern, mode_of_action,
+                    result1.add(new m.wqm.sednutpractscoresfull.V1_0.Result1(nut_pract_score,
+                            nutrient_practice_score_id, practice_id, practice_code,
+                            conservation_practice, wqm_concern, mode_of_action,
                             pract_discrim_type, min_pract_discrim, max_pract_discrim));
 
                 }
@@ -77,25 +68,30 @@
     @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("nut_pract_score", rs1.nut_pract_score, "nut_pract_score"));
-            tmpArr.put(JSONUtils.dataDesc("nutrient_practice_score_id", rs1.nutrient_practice_score_id, "nutrient_practice_score_id"));
-            tmpArr.put(JSONUtils.dataDesc("practice_id", rs1.practice_id, "NRCS conservaton practice identifier (not the practice code)"));
-            tmpArr.put(JSONUtils.dataDesc("practice_code", rs1.practice_code, "NRCS conservation practice code"));
-            tmpArr.put(JSONUtils.dataDesc("conservation_practice", rs1.conservation_practice, "NRCS conservation practice name"));
-            tmpArr.put(JSONUtils.dataDesc("wqm_concern", rs1.wqm_concern, "wqm_concern"));
-            tmpArr.put(JSONUtils.dataDesc("mode_of_action", rs1.mode_of_action, "Mode of action of the nutrient technique"));
-            tmpArr.put(JSONUtils.dataDesc("pract_discrim_type", rs1.pract_discrim_type, "Type of sediment nutrient mitigation practice discriminator"));
-            tmpArr.put(JSONUtils.dataDesc("min_pract_discrim", rs1.min_pract_discrim, "Minimum mitigation practice discriminator value"));
-            tmpArr.put(JSONUtils.dataDesc("max_pract_discrim", rs1.max_pract_discrim, "Maximum mitigation practice discriminator value"));
-            result1Arr.put(JSONUtils.dataDesc("Nutrient Sediment practice Scores", tmpArr, "NutriSediPracScores"));
+        try {
+            JSONArray result1Arr = new JSONArray();
+            for (m.wqm.sednutpractscoresfull.V1_0.Result1 rs1 : result1) {
+                JSONArray tmpArr = new JSONArray();
+                tmpArr.put(JSONUtils.dataDesc("nut_pract_score", rs1.nut_pract_score, "nut_pract_score"));
+                tmpArr.put(JSONUtils.dataDesc("nutrient_practice_score_id", rs1.nutrient_practice_score_id, "nutrient_practice_score_id"));
+                tmpArr.put(JSONUtils.dataDesc("practice_id", rs1.practice_id, "NRCS conservaton practice identifier (not the practice code)"));
+                tmpArr.put(JSONUtils.dataDesc("practice_code", rs1.practice_code, "NRCS conservation practice code"));
+                tmpArr.put(JSONUtils.dataDesc("conservation_practice", rs1.conservation_practice, "NRCS conservation practice name"));
+                tmpArr.put(JSONUtils.dataDesc("wqm_concern", rs1.wqm_concern, "wqm_concern"));
+                tmpArr.put(JSONUtils.dataDesc("mode_of_action", rs1.mode_of_action, "Mode of action of the nutrient technique"));
+                tmpArr.put(JSONUtils.dataDesc("pract_discrim_type", rs1.pract_discrim_type, "Type of sediment nutrient mitigation practice discriminator"));
+                tmpArr.put(JSONUtils.dataDesc("min_pract_discrim", rs1.min_pract_discrim, "Minimum mitigation practice discriminator value"));
+                tmpArr.put(JSONUtils.dataDesc("max_pract_discrim", rs1.max_pract_discrim, "Maximum mitigation practice discriminator value"));
+                result1Arr.put(JSONUtils.dataDesc("Nutrient Sediment practice Scores", tmpArr, "NutriSediPracScores"));
+            }
+            putResult("operation", result1Arr);
+        } catch (JSONException ex) {
+            LOG.log(Level.SEVERE, "Error in processing the response JSON for WQM-23!", ex);
+            throw new ServiceException("Error in processing the response JSON.", ex);
         }
-        putResult("operation", result1Arr);
     }
 
-    public class Result1 {
+    static class Result1 {
 
         int nut_pract_score;
         int nutrient_practice_score_id;

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

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