upgrade

Nolife999 · May 27, 2019 · 591de01 · 591de01
1 parent d5c86b7
commit 591de01
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.5.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/> 
     </parent>
 
     <groupId>it.istat.rservice</groupId>

diff --git a/src/main/java/it/istat/rservice/app/domain/converter/ListToStringConverter.java b/src/main/java/it/istat/rservice/app/domain/converter/ListToStringConverter.java
@@ -29,47 +29,59 @@
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
+import org.apache.log4j.Logger;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 @Converter
 public class ListToStringConverter implements AttributeConverter<List<String>, String> {
+	final static Logger logger = Logger.getLogger(ListToStringConverter.class);
 
-    @Override
-    public String convertToDatabaseColumn(List<String> data) {
-        String value = "";
-        JSONObject obj = new JSONObject();
-        JSONArray allDataArray = new JSONArray();
+	@Override
+	public String convertToDatabaseColumn(List<String> data) {
+		String value = "";
+		JSONObject obj = new JSONObject();
+		JSONArray allDataArray = new JSONArray();
 
-        JSONObject eachData = null;
+		JSONObject eachData = null;
+		try {
 
-        for (int index = 0; index < data.size(); index++) {
-            eachData = new JSONObject();
+			for (int index = 0; index < data.size(); index++) {
+				eachData = new JSONObject();
 
-            eachData.put("r", new Integer(index));
-            eachData.put("v", data.get(index)!=null?data.get(index):"");
+				eachData.put("r", new Integer(index));
 
-            allDataArray.put(eachData);
-        }
+				eachData.put("v", data.get(index) != null ? data.get(index) : "");
 
-        obj.put("valori", allDataArray);
-        value = obj.toString();
+				allDataArray.put(eachData);
+			}
 
-        return value;
-    }
+			obj.put("valori", allDataArray);
 
-    @Override
-    public List<String> convertToEntityAttribute(String data) {
-        List<String> listValue = new ArrayList<String>();
+			value = obj.toString();
+		} catch (JSONException e) {
 
-        JSONObject jsonObj = new JSONObject(data);
-        JSONArray jsonArray = (JSONArray) jsonObj.get("valori");
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject obj = jsonArray.getJSONObject(i);
-            listValue.add(obj.getString("v"));
-        }
+			logger.error(e);
+		}
+		return value;
+	}
 
-        return listValue;
-    }
+	@Override
+	public List<String> convertToEntityAttribute(String data) {
+		List<String> listValue = new ArrayList<String>();
+		try {
+			JSONObject jsonObj = new JSONObject(data);
+			JSONArray jsonArray = (JSONArray) jsonObj.get("valori");
+			for (int i = 0; i < jsonArray.length(); i++) {
+				JSONObject obj = jsonArray.getJSONObject(i);
+				listValue.add(obj.getString("v"));
+			}
+		} catch (JSONException e) {
+
+			logger.error(e);
+		}
+		return listValue;
+	}
 
 }
diff --git a/src/main/java/it/istat/rservice/dataset/controller/rest/DatasetControllerRest.java b/src/main/java/it/istat/rservice/dataset/controller/rest/DatasetControllerRest.java
@@ -33,6 +33,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -97,7 +99,7 @@ public List<DatasetColonna> loadDataSetColonnaSql(@PathVariable("dfile") Long df
     public String loadDatasetValori2(HttpServletRequest request, Model model, @PathVariable("dfile") Long dfile,
             @PathVariable("parametri") String parametri, @RequestParam("length") Integer length,
             @RequestParam("start") Integer start, @RequestParam("draw") Integer draw,
-            @RequestParam Map<String, String> allParams) throws IOException {
+            @RequestParam Map<String, String> allParams) throws IOException, JSONException {
 
         String indexColunmToOrder = allParams.get("order[0][column]");
         String nameColumnToOrder = allParams.get("columns[" + indexColunmToOrder + "][data]");

diff --git a/src/main/java/it/istat/rservice/dataset/service/DatasetService.java b/src/main/java/it/istat/rservice/dataset/service/DatasetService.java
@@ -36,6 +36,7 @@
 import javax.transaction.Transactional;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -183,7 +184,7 @@ public DataTableBean loadDatasetValori(Long dfile, Integer length, Integer start
         return db;
     }
 
-    public String loadDatasetValori1(Long dfile, Integer length, Integer start, Integer draw, HashMap<String, String> parametri, String nameColumnToOrder, String dirColumnOrder) {
+    public String loadDatasetValori1(Long dfile, Integer length, Integer start, Integer draw, HashMap<String, String> parametri, String nameColumnToOrder, String dirColumnOrder) throws JSONException {
         List<DatasetColonna> dataList = sqlgenericDao.findDatasetColonnaParamsbyQuery(dfile, start, start + length, parametri, nameColumnToOrder, dirColumnOrder);
 
         Integer numRighe = 0;

diff --git a/src/main/java/it/istat/rservice/workflow/controller/rest/WorkflowRestController.java b/src/main/java/it/istat/rservice/workflow/controller/rest/WorkflowRestController.java
@@ -31,6 +31,8 @@
 import java.util.StringTokenizer;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -65,7 +67,7 @@ public class WorkflowRestController {
 	public String loadDatasetValori2(HttpServletRequest request, Model model,
 			@PathVariable("idelaborazione") Long idelaborazione, @PathVariable("tipoCampo") Integer tipoCampo,
 			@PathVariable("paramsFilter") String paramsFilter, @RequestParam("length") Integer length,
-			@RequestParam("start") Integer start, @RequestParam("draw") Integer draw) throws IOException {
+			@RequestParam("start") Integer start, @RequestParam("draw") Integer draw) throws IOException, JSONException {
 
 		HashMap<String, String> parameters = null;
 		String noparams = "noparams";

diff --git a/src/main/java/it/istat/rservice/workflow/service/WorkflowService.java b/src/main/java/it/istat/rservice/workflow/service/WorkflowService.java
@@ -36,6 +36,7 @@
 
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,7 +119,7 @@ public void eliminaElaborazione(Long id) {
         elaborazioneDao.deleteById(id);
     }
 
-    public String loadWorkSetValori(Long idelaborazione, Integer length, Integer start, Integer draw) {
+    public String loadWorkSetValori(Long idelaborazione, Integer length, Integer start, Integer draw) throws JSONException {
         List<SxWorkset> dataList = workSetDao.findWorkSetDatasetColonnabyQuery(idelaborazione, start, start + length);
         Integer numRighe = 0;
         if (!dataList.isEmpty()) {
@@ -143,7 +144,7 @@ public String loadWorkSetValori(Long idelaborazione, Integer length, Integer sta
         return obj.toString();
     }
 
-    public String loadWorkSetValoriByElaborazione(Long idelaborazione, Integer tipoCampo, Integer length, Integer start, Integer draw, HashMap<String, String> paramsFilter) {
+    public String loadWorkSetValoriByElaborazione(Long idelaborazione, Integer tipoCampo, Integer length, Integer start, Integer draw, HashMap<String, String> paramsFilter) throws JSONException {
 
         List<SxWorkset> dataList = sqlGenericDao.findWorkSetDatasetColonnaByElaborazioneQuery(idelaborazione,tipoCampo, start, start + length, paramsFilter);
         // start, start + length, query_filter);