Merge branch 'master' of 149.202.172.180:/home/mattia/sicilia/sources

liferay-plugins-sdk-6.2/build.portos.properties

@@ -1,7 +1,3 @@
-# Managed by Liferay IDE (remove this comment to prevent future updates)
-
-#Managed by Liferay IDE (remove this comment to prevent future updates)
-#Fri Sep 27 09:42:25 CEST 2019
 app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
 app.server.tomcat.deploy.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
 app.server.parent.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -10,14 +10,15 @@ author=Liferay, Inc.
 licenses=LGPL
 liferay-versions=6.2.0+
 portal-dependency-jars=\
+    axis.jar,\
+    commons-discovery.jar,\
+    httpclient.jar,\
+    jaxrpc.jar,\
     jstl-api.jar,\
     jstl-impl.jar,\
-    jaxrpc.jar,\
+    util-java.jar,\
-    commons-discovery.jar,\
     wsdl4j.jar,\
-    axis.jar,\
+    xml-apis.jar
-    xml-apis.jar,\
-    httpclient.jar
 portal-dependency-tlds=\
     c.tld
 required-deployment-contexts=\

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java

@@ -0,0 +1,81 @@
+package it.mwg.sismica.bo.util;
+
+import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo;
+import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.ContentTypes;
+import com.liferay.portal.kernel.util.HttpUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Http.Options;
+
+public class HttpServiceUtil {
+	private static final Log _log = LogFactoryUtil.getLog(HttpServiceUtil.class);
+
+	public static JSONObject postProtocolloBean(long companyId, Protocollo protocolloBean) throws Exception {
+
+		flexjson.JSONSerializer serializer = new flexjson.JSONSerializer();
+		serializer.exclude("*.class");
+		String json = serializer.serialize(protocolloBean);
+
+		String url = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId,
+				ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL);
+
+		return postJson(url, json);
+	}
+	
+	public static JSONObject postJson(String url, String json) throws Exception {
+		JSONObject risposta = null;
+		HttpPost request = new HttpPost(url);
+		request.setHeader("Content-type", ContentTypes.APPLICATION_JSON);
+		request.setEntity(new StringEntity(json));
+		CloseableHttpClient client = HttpClientBuilder.create().build();
+		HttpResponse response = client.execute(request);
+
+		int statusCode = response.getStatusLine().getStatusCode();
+		String responseBody = EntityUtils.toString(response.getEntity(), StringPool.UTF8);
+		client.close();
+
+		if (statusCode == HttpServletResponse.SC_OK || statusCode == HttpServletResponse.SC_CREATED) {
+			risposta = JSONFactoryUtil.createJSONObject(responseBody);
+			_log.info(url + " || " + json + " || " + risposta);
+		} else {
+			_log.info(url + " || " + json + " || " + statusCode + ": " + responseBody);
+			throw new PortalException(statusCode + StringPool.SPACE + responseBody);
+		}
+		return risposta;
+	}
+
+	public static String getUrl(String url) throws Exception {
+		return getUrl(url, StringPool.BLANK);
+	}
+
+	public static String getUrl(String url, String defaultValue) throws Exception {
+		Options options = new Options();
+		options.setLocation(url);
+		options.setPost(false);
+
+		String responseBody = HttpUtil.URLtoString(options);
+
+		_log.info(url + " || " + responseBody);
+		if (options.getResponse().getResponseCode() != HttpServletResponse.SC_OK) {
+			throw new Exception(url + ": " + options.getResponse().getResponseCode());
+			// responseBody = defaultValue;
+		}
+		return responseBody;
+	}
+}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java

@@ -849,10 +849,7 @@ public interface DettPraticaLocalService extends BaseLocalService,
 			com.liferay.portal.kernel.exception.SystemException;
 
 	public void sendToVersioning(long dettPraticaId, java.lang.String url)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception;
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException;
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getNumeroDiVersioni(java.lang.String url)

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java

@@ -4200,10 +4200,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService {
 
 	@Override
 	public void sendToVersioning(long dettPraticaId, java.lang.String url)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		try {
 			_invokableLocalService.invokeMethod(_methodName77,
 				_methodParameterTypes77,
@@ -4212,24 +4209,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService {
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
 
-			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+			if (t instanceof java.lang.Exception) {
-				throw (com.liferay.portal.kernel.exception.PortalException)t;
+				throw (java.lang.Exception)t;
-			}
-
-			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
-				throw (com.liferay.portal.kernel.exception.SystemException)t;
-			}
-
-			if (t instanceof java.io.IOException) {
-				throw (java.io.IOException)t;
-			}
-
-			if (t instanceof java.lang.NoSuchFieldException) {
-				throw (java.lang.NoSuchFieldException)t;
-			}
-
-			if (t instanceof java.lang.SecurityException) {
-				throw (java.lang.SecurityException)t;
 			}
 
 			if (t instanceof RuntimeException) {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java

@@ -1149,10 +1149,7 @@ public class DettPraticaLocalServiceUtil {
 	}
 
 	public static void sendToVersioning(long dettPraticaId, java.lang.String url)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		getService().sendToVersioning(dettPraticaId, url);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java

@@ -1218,10 +1218,7 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService,
 
 	@Override
 	public void sendToVersioning(long dettPraticaId, java.lang.String url)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		_dettPraticaLocalService.sendToVersioning(dettPraticaId, url);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java

@@ -341,8 +341,5 @@ public interface DettPraticaService extends BaseService, InvokableService {
 			java.io.IOException;
 
 	public void sendToVersioning(long dettPraticaId, long companyId)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception;
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException;
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java

@@ -1740,10 +1740,7 @@ public class DettPraticaServiceClp implements DettPraticaService {
 
 	@Override
 	public void sendToVersioning(long dettPraticaId, long companyId)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		try {
 			_invokableService.invokeMethod(_methodName26,
 				_methodParameterTypes26,
@@ -1752,24 +1749,8 @@ public class DettPraticaServiceClp implements DettPraticaService {
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
 
-			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+			if (t instanceof java.lang.Exception) {
-				throw (com.liferay.portal.kernel.exception.PortalException)t;
+				throw (java.lang.Exception)t;
-			}
-
-			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
-				throw (com.liferay.portal.kernel.exception.SystemException)t;
-			}
-
-			if (t instanceof java.io.IOException) {
-				throw (java.io.IOException)t;
-			}
-
-			if (t instanceof java.lang.NoSuchFieldException) {
-				throw (java.lang.NoSuchFieldException)t;
-			}
-
-			if (t instanceof java.lang.SecurityException) {
-				throw (java.lang.SecurityException)t;
 			}
 
 			if (t instanceof RuntimeException) {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java

@@ -483,10 +483,7 @@ public class DettPraticaServiceUtil {
 	}
 
 	public static void sendToVersioning(long dettPraticaId, long companyId)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		getService().sendToVersioning(dettPraticaId, companyId);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java

@@ -493,10 +493,7 @@ public class DettPraticaServiceWrapper implements DettPraticaService,
 
 	@Override
 	public void sendToVersioning(long dettPraticaId, long companyId)
-		throws com.liferay.portal.kernel.exception.PortalException,
+		throws java.lang.Exception {
-			com.liferay.portal.kernel.exception.SystemException,
-			java.io.IOException, java.lang.NoSuchFieldException,
-			java.lang.SecurityException {
 		_dettPraticaService.sendToVersioning(dettPraticaId, companyId);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ProtocolloUtil.java

@@ -1,119 +1,79 @@
 package it.tref.liferay.portos.bo.util;
 
+import it.mwg.sismica.bo.util.HttpServiceUtil;
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.protocollo.model.File;
 import it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo;
 import it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo.TipoProtocollo;
-import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
-
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.codec.digest.DigestUtils;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;
-import com.liferay.portal.kernel.util.ContentTypes;
-import com.liferay.portal.kernel.util.Http.Body;
-import com.liferay.portal.kernel.util.Http.Options;
-import com.liferay.portal.kernel.util.HttpUtil;
-import com.liferay.portal.kernel.util.StreamUtil;
-import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 
 public class ProtocolloUtil {
 
-	public static String protocollaPartenzaAccessoAtti(long accessoAttiId, long intPraticaId, long groupId, String className, long companyId, String screenName) throws Exception {
+	public static String protocollaPartenzaAccessoAtti(long accessoAttiId, long intPraticaId, long groupId,
+			String className, long companyId, String screenName) throws Exception {
 
-		String protocollo = null;
+		File allegato = new File();
 
-		InputStream inputStream = null;
+		String doc = String.valueOf(accessoAttiId);
 
-		try {
+		String sha256 = DigestUtils.sha256Hex(doc);
 
-			File allegato = new File();
+		allegato.setFileId("0");
-
+		allegato.setFileSha256(sha256);
-			String doc = String.valueOf(accessoAttiId);
-
-			String sha256 = DigestUtils.sha256Hex(doc);
-
-			allegato.setFileId("0");
-			allegato.setFileSha256(sha256);
-
-			// utilizzato anche come discriminate tra la 1a e la 2a chiamata
-			// 1a recupero numero protocollo -> 1 allegato finto
-			// 2a aggiorno dati del documento prodotto -> 2 allegati, il 1o giusto e il 2o per recupero
-			// num protocollo
-
-			Protocollo protocolloBean = new Protocollo();
-			protocolloBean.setOggetto(generaOggettoProtocollo(className, accessoAttiId));
-			protocolloBean.setChiuso(false);
-			protocolloBean.setTipo(TipoProtocollo.USCITA);
-			protocolloBean.setUtenteId(screenName);
-			protocolloBean.setUfficioId(String.valueOf(groupId));
-			protocolloBean.setPraticaId(String.valueOf(accessoAttiId));
-			protocolloBean.setFiles(Collections.singletonList(allegato));
-			Options options = createCall(companyId, protocolloBean, true);
-
-			String responseBody = HttpUtil.URLtoString(options);
-			if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-					|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-				JSONObject risposta = JSONFactoryUtil.createJSONObject(responseBody);
-				protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-			} else {
-				throw new Exception(options.getResponse().getResponseCode() + StringPool.SPACE + responseBody);
-			}
 
-		} finally {
+		// utilizzato anche come discriminate tra la 1a e la 2a chiamata 1a
-			StreamUtil.cleanUp(inputStream);
+		// recupero numero protocollo -> 1 allegato finto 2a aggiorno dati del
-		}
+		// documento prodotto -> 2 allegati, il 1o giusto e il 2o per recupero
+		// num protocollo
 
-		return protocollo;
+		Protocollo protocolloBean = new Protocollo();
+		protocolloBean.setOggetto(generaOggettoProtocollo(className, accessoAttiId));
+		protocolloBean.setChiuso(false);
+		protocolloBean.setTipo(TipoProtocollo.USCITA);
+		protocolloBean.setUtenteId(screenName);
+		protocolloBean.setUfficioId(String.valueOf(groupId));
+		protocolloBean.setPraticaId(String.valueOf(accessoAttiId));
+		protocolloBean.setFiles(Collections.singletonList(allegato));
+		JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean);
+		return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
 	}
 
-	public static String protocollaArrivoAccessoAtti(long groupId, long companyId, String userName, long accessoAttiId, String className) throws Exception {
+	public static String protocollaArrivoAccessoAtti(long groupId, long companyId, String userName,
-
+			long accessoAttiId, String className) throws Exception {
-	    String protocollo = null;
-
-	    List<File> allegati = new ArrayList<File>();
-	    File allegato = new File();
-	    String doc = String.valueOf(accessoAttiId);
-	    String sha256 = DigestUtils.sha256Hex(doc);
-	    allegato.setFileId("0");
-	    allegato.setFileSha256(sha256);
-	    allegati.add(allegato);
-	    
-	    Protocollo protocolloBean = new Protocollo();
-	    protocolloBean.setOggetto(generaOggettoProtocollo(className, accessoAttiId));
-	    protocolloBean.setChiuso(false);
-	    protocolloBean.setTipo(TipoProtocollo.INGRESSO);
-	    protocolloBean.setUtenteId(userName);
-	    protocolloBean.setUfficioId(String.valueOf(groupId));
-	    protocolloBean.setPraticaId(String.valueOf(accessoAttiId));
-
-	    protocolloBean.setFiles(allegati);
-	    Options options = createCall(companyId, protocolloBean, true);
-
 
-	    String responseBody = HttpUtil.URLtoString(options);
+		String protocollo = null;
-	    if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-	        || options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-	      JSONObject risposta = JSONFactoryUtil.createJSONObject(responseBody);
-	      protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-	    } else {
-	      throw new Exception(options.getResponse().getResponseCode() + StringPool.SPACE + responseBody);
-	    }
 
-	    return protocollo;
+		List<File> allegati = new ArrayList<File>();
-	  }
+		File allegato = new File();
+		String doc = String.valueOf(accessoAttiId);
+		String sha256 = DigestUtils.sha256Hex(doc);
+		allegato.setFileId("0");
+		allegato.setFileSha256(sha256);
+		allegati.add(allegato);
+
+		Protocollo protocolloBean = new Protocollo();
+		protocolloBean.setOggetto(generaOggettoProtocollo(className, accessoAttiId));
+		protocolloBean.setChiuso(false);
+		protocolloBean.setTipo(TipoProtocollo.INGRESSO);
+		protocolloBean.setUtenteId(userName);
+		protocolloBean.setUfficioId(String.valueOf(groupId));
+		protocolloBean.setPraticaId(String.valueOf(accessoAttiId));
+
+		protocolloBean.setFiles(allegati);
+
+		JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean);
+		return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
+	}
 
 	public static String generaOggettoProtocollo(String className, long classPk) {
 
@@ -128,26 +88,4 @@ public class ProtocolloUtil {
 
 		return "Oggetto: " + className + " " + classPk;
 	}
-	private static Options createCall(long companyId, Protocollo protocolloBean, boolean post) throws SystemException {
-
-		String url =
-				ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId,
-						ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL);
-
-		Options options = new Options();
-		options.setLocation(url);
-		options.setPost(post);
-
-		flexjson.JSONSerializer serialize = new flexjson.JSONSerializer();
-		serialize.exclude("*.class");
-		String protocollo = serialize.serialize(protocolloBean);
-		Body body = new Body(protocollo, ContentTypes.APPLICATION_JSON, "UTF-8");
-
-		options.setBody(body);
-
-
-		return options;
-
-	}
-
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java

@@ -19,7 +19,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.persistence.AsseverazioneUtil;
 import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
@@ -28,7 +27,6 @@ import it.tref.liferay.portos.bo.shared.util.GenericUtils;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
-import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.util.AsseverazioniUtil;
 
 import java.io.IOException;
@@ -39,6 +37,15 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.ByteArrayBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
@@ -47,10 +54,8 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.util.Http.FilePart;
-import com.liferay.portal.kernel.util.Http.Options;
-import com.liferay.portal.kernel.util.HttpUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.UniqueList;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
@@ -2476,28 +2481,23 @@ public class ValidazionePraticaUtil {
 		Company company = CompanyLocalServiceUtil.getCompany(companyId);
 		String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute("url_pdf_extractor", false);
 
-		Options options = new Options();
+		HttpPost request = new HttpPost(urlPdfExtractor);
-		options.setLocation(urlPdfExtractor);
+		MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-		options.setPost(true);
+		builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-		List<FilePart> fileParts = new ArrayList<>();
+		builder.addPart("file", new ByteArrayBody(fileBytes, fileName));
-		// TODO perché cazzo non funziona il contentType???
+		request.setEntity(builder.build());
-		// FilePart filePart = new FilePart("file", fileName, fileBytes,
+		CloseableHttpClient client = HttpClientBuilder.create().build();
-		// ContentType.P7M.getContentType(), "UTF-8");
+		HttpResponse httpResponse = client.execute(request);
-		FilePart filePart = new FilePart("file", fileName, fileBytes, "application/pkcs7-signature", "UTF-8");
+		int statusCode = httpResponse.getStatusLine().getStatusCode();
-		fileParts.add(filePart);
+		String responseBody = EntityUtils.toString(httpResponse.getEntity(), StringPool.UTF8);
-		options.setFileParts(fileParts);
+		client.close();
-
+
-		String responseBody = HttpUtil.URLtoString(options);
+		if (statusCode == HttpServletResponse.SC_OK || statusCode == HttpServletResponse.SC_CREATED) {
-
-		if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-				|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-
 			JSONArray arrayFirme = JSONFactoryUtil.createJSONObject(responseBody).getJSONArray("cf");
 			List<String> cf = new UniqueList<String>();
 			for (int i = 0; i < arrayFirme.length(); i++) {
 				cf.add(arrayFirme.getString(i));
 			}
-
 			return cf;
 
 		} else {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/PuliziaDatabase.java

@@ -5,9 +5,24 @@
  */
 package it.mwg.sismica.bo.util;
 
+import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
+import it.tref.liferay.portos.bo.model.Delega;
 import it.tref.liferay.portos.bo.model.DettPratica;
+import it.tref.liferay.portos.bo.model.DocAggiuntiva;
+import it.tref.liferay.portos.bo.model.DocPratica;
+import it.tref.liferay.portos.bo.model.FineLavori;
+import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.model.Soggetto;
+import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -46,6 +61,8 @@ public class PuliziaDatabase {
 
 	public static List<String> pulisci(ServiceContext serviceContext) {
 		List<String> esito = new ArrayList<>();
+
+		esito.addAll(puliziaPreliminare());
 		esito.addAll(puliziaDocumentLibrary());
 		esito.addAll(svuotaDatabase(serviceContext));
 
@@ -60,6 +77,137 @@ public class PuliziaDatabase {
 		return esito;
 	}
 
+	private static List<String> puliziaPreliminare() {
+		List<String> esito = new ArrayList<>();
+		try {
+			Connection connection = DataAccess.getUpgradeOptimizedConnection();
+			Statement s = connection.createStatement();
+			int rows = s.executeUpdate("DELETE FROM portos_bo_intpratica WHERE intpraticaid IN ("
+					+ "SELECT intpraticaid FROM portos_bo_intpratica i "
+					+ "LEFT JOIN group_ g ON i.groupid=g.groupid WHERE g.groupid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_intpratica");
+			rows = s.executeUpdate("DELETE FROM portos_bo_dettpratica WHERE dettpraticaid IN ("
+					+ "SELECT dettpraticaid FROM portos_bo_dettpratica d "
+					+ "LEFT JOIN portos_bo_intpratica i ON d.intpraticaid=i.intpraticaid "
+					+ "WHERE i.intpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_dettpratica");
+			rows = s.executeUpdate("DELETE FROM portos_bo_controllopratica WHERE controllopraticaid IN ("
+					+ "SELECT controllopraticaid FROM portos_bo_controllopratica c "
+					+ "LEFT JOIN portos_bo_intpratica i ON c.intpraticaid=i.intpraticaid "
+					+ "WHERE i.intpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_controllopratica");
+			rows = s.executeUpdate("DELETE FROM portos_bo_collaudo WHERE collaudoid IN ("
+					+ "SELECT collaudoid FROM portos_bo_collaudo c "
+					+ "LEFT JOIN portos_bo_intpratica i ON c.intpraticaid=i.intpraticaid "
+					+ "WHERE i.intpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_collaudo");
+			rows = s.executeUpdate("DELETE FROM portos_bo_delega WHERE delegaid IN ("
+					+ "SELECT delegaid FROM portos_bo_delega d "
+					+ "LEFT JOIN portos_bo_dettpratica dp ON d.dettpraticaid=dp.dettpraticaid "
+					+ "WHERE dp.dettpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_delega");
+			rows = s.executeUpdate("DELETE FROM portos_bo_finelavori WHERE finelavoriid IN ("
+					+ "SELECT finelavoriid FROM portos_bo_finelavori f "
+					+ "LEFT JOIN portos_bo_intpratica i ON f.intpraticaid=i.intpraticaid "
+					+ "WHERE i.intpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_finelavori");
+			rows = s.executeUpdate("DELETE FROM portos_bo_soggetto WHERE soggettoid IN ("
+					+ "SELECT soggettoid FROM portos_bo_soggetto s "
+					+ "LEFT JOIN portos_bo_dettpratica d ON s.dettpraticaid=d.dettpraticaid "
+					+ "WHERE d.dettpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_soggetto");
+
+			int cancellati = 0;
+			int start = 0;
+			int totali = 0;
+			List<DocAggiuntiva> docs = null;
+			do {
+				docs = DocAggiuntivaLocalServiceUtil.getDocAggiuntivas(start, start + SLICE);
+				int rimossi = 0;
+				for (DocAggiuntiva doc : docs) {
+					IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(doc.getIntPraticaId());
+					DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(doc
+							.getDettPraticaId());
+					if (Validator.isNull(intPratica) || Validator.isNull(dettPratica)) {
+						DocAggiuntivaLocalServiceUtil.deleteDocAggiuntiva(doc);
+						cancellati++;
+						rimossi++;
+					}
+				}
+				totali += docs.size();
+				start += SLICE - rimossi;
+			} while (docs.size() > 0);
+			esitoLog(esito, "Analizzati " + totali + " DocAggiuntiva, cancellati " + cancellati);
+
+			cancellati = 0;
+			start = 0;
+			totali = 0;
+			List<DocPratica> docs2 = null;
+			do {
+				docs2 = DocPraticaLocalServiceUtil.getDocPraticas(start, start + SLICE);
+				int rimossi = 0;
+				for (DocPratica doc : docs2) {
+					boolean rimuovi = false;
+					if (Collaudo.class.getName().equals(doc.getClassName())) {
+						Collaudo collaudo = null;
+						try {
+							collaudo = CollaudoLocalServiceUtil.getCollaudo(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(collaudo);
+					} else if (Delega.class.getName().equals(doc.getClassName())) {
+						Delega delega = null;
+						try {
+							delega = DelegaLocalServiceUtil.getDelega(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(delega);
+					} else if (DettPratica.class.getName().equals(doc.getClassName())) {
+						DettPratica dettPratica = null;
+						try {
+							dettPratica = DettPraticaLocalServiceUtil.getDettPratica(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(dettPratica);
+					} else if (FineLavori.class.getName().equals(doc.getClassName())) {
+						FineLavori fineLavori = null;
+						try {
+							fineLavori = FineLavoriLocalServiceUtil.getFineLavori(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(fineLavori);
+					} else if (IntPratica.class.getName().equals(doc.getClassName())) {
+						IntPratica intPratica = null;
+						try {
+							intPratica = IntPraticaLocalServiceUtil.getIntPratica(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(intPratica);
+					} else if (Soggetto.class.getName().equals(doc.getClassName())) {
+						Soggetto soggetto = null;
+						try {
+							soggetto = SoggettoLocalServiceUtil.getSoggetto(doc.getClassPk());
+						} catch (PortalException e) {
+						}
+						rimuovi = Validator.isNull(soggetto);
+					}
+					if (rimuovi) {
+						DocPraticaLocalServiceUtil.deleteDocPratica(doc);
+						cancellati++;
+						rimossi++;
+					}
+				}
+				totali += docs2.size();
+				start += SLICE - rimossi;
+				_log.info("Analizzati " + totali + " DocPratica, cancellati " + cancellati);
+			} while (docs2.size() > 0);
+			esitoLog(esito, "Analizzati " + totali + " DocPratica, cancellati " + cancellati);
+		} catch (PortalException | SQLException | SystemException e) {
+			esitoLog(esito, "Interrotto per errore: " + e.getMessage());
+		}
+		return esito;
+	}
+
 	private static List<String> svuotaDatabase(ServiceContext serviceContext) {
 		List<String> esito = new ArrayList<>();
 		int rows = 0;
@@ -239,6 +387,24 @@ public class PuliziaDatabase {
 					+ "ON a.classpk=b.fileentryid WHERE a.classnameid=" + dlFileEntryClassNameId
 					+ " AND b.fileentryid IS NULL)");
 			esitoLog(esito, "Cancellate " + rows + " righe da socialactivity");
+
+			rows = s.executeUpdate("DELETE FROM systemevent WHERE systemeventid IN ("
+					+ "SELECT systemeventid FROM systemevent a LEFT JOIN dlfileentry b "
+					+ "ON a.classpk=b.fileentryid WHERE a.classnameid=" + dlFileEntryClassNameId
+					+ " AND b.fileentryid IS NULL)");
+			rows += s.executeUpdate("DELETE FROM systemevent WHERE systemeventid IN ("
+					+ "SELECT systemeventid FROM systemevent a LEFT JOIN dlfolder b "
+					+ "ON a.classpk=b.folderid WHERE a.classnameid=" + dlFolderClassNameId
+					+ " AND b.folderid IS NULL)");
+			rows += s.executeUpdate("DELETE FROM systemevent WHERE systemeventid IN ("
+					+ "SELECT systemeventid FROM systemevent a LEFT JOIN portos_bo_controllopratica b "
+					+ "ON a.classpk=b.controllopraticaid WHERE a.classnameid=" + controlloPraticaClassNameId
+					+ " AND b.controllopraticaid IS NULL)");
+			rows += s.executeUpdate("DELETE FROM systemevent WHERE systemeventid IN ("
+					+ "SELECT systemeventid FROM systemevent a LEFT JOIN portos_bo_dettpratica b "
+					+ "ON a.classpk=b.dettpraticaid WHERE a.classnameid=" + dettPraticaClassNameId
+					+ " AND b.dettpraticaid IS NULL)");
+			esitoLog(esito, "Cancellate " + rows + " righe da systemevent");
 		} catch (SQLException | SystemException e) {
 			esitoLog(esito, "Interrotto per errore: " + e.getMessage());
 		}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerEstrazioneFirme.java

@@ -4,13 +4,8 @@ import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
-import it.tref.liferay.portos.bo.util.ContentType;
-
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -18,6 +13,14 @@ import java.util.concurrent.locks.ReentrantLock;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.ByteArrayBody;
+import org.apache.http.entity.mime.content.ContentBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
 
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.json.JSONArray;
@@ -28,10 +31,8 @@ import com.liferay.portal.kernel.messaging.Message;
 import com.liferay.portal.kernel.messaging.MessageListener;
 import com.liferay.portal.kernel.messaging.MessageListenerException;
 import com.liferay.portal.kernel.util.FileUtil;
-import com.liferay.portal.kernel.util.Http.FilePart;
-import com.liferay.portal.kernel.util.Http.Options;
-import com.liferay.portal.kernel.util.HttpUtil;
 import com.liferay.portal.kernel.util.PropsUtil;
+import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.UniqueList;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.model.Company;
@@ -68,9 +69,10 @@ public class SchedulerEstrazioneFirme implements MessageListener {
 						List<DocPratica> docPratiche = DocPraticaLocalServiceUtil.findByStaus(
 								WorkflowConstants.STATUS_PENDING, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 
+						String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute(
+								"url_pdf_extractor", false);
+
 						for (DocPratica docPratica : docPratiche) {
-							String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute(
-									"url_pdf_extractor", false);
 							DLFileEntry fileEntry = DLFileEntryLocalServiceUtil.getFileEntry(docPratica
 									.getDlFileEntryId());
 							User user = UserLocalServiceUtil.getRoleUsers(
@@ -80,23 +82,18 @@ public class SchedulerEstrazioneFirme implements MessageListener {
 									.create(user));
 							byte[] fileBytes = FileUtil.getBytes(fileEntry.getContentStream());
 
-							Options options = new Options();
+							MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-							options.setLocation(urlPdfExtractor);
+							ContentBody body = new ByteArrayBody(fileBytes, fileEntry.getTitle());
-							options.setPost(true);
+							builder.addPart("file", body);
-							List<FilePart> fileParts = new ArrayList<>();
+							HttpPost request = new HttpPost(urlPdfExtractor);
-							fileParts.add(new FilePart("file", fileEntry.getTitle(), fileBytes,
+							request.setEntity(builder.build());
-									ContentType.P7M.getContentType(), "UTF-8"));
+							CloseableHttpClient client = HttpClientBuilder.create().build();
-							options.setFileParts(fileParts);
+							HttpResponse response = client.execute(request);
-
+
-							String responseBody;
+							int statusCode = response.getStatusLine().getStatusCode();
-							try {
+							String responseBody = EntityUtils.toString(response.getEntity(), StringPool.UTF8);
-								responseBody = HttpUtil.URLtoString(options);
+							if (statusCode == HttpServletResponse.SC_OK
-							} catch (Exception e) {
+									|| statusCode == HttpServletResponse.SC_CREATED) {
-								responseBody = "";
-							}
-
-							if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-									|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
 								JSONArray arrayFirme = JSONFactoryUtil.createJSONObject(responseBody)
 										.getJSONArray("cf");
 								List<String> cf = new UniqueList<String>();
@@ -116,14 +113,16 @@ public class SchedulerEstrazioneFirme implements MessageListener {
 										errorCode);
 								_log.warn("P7M REST extractor error. Response: " + new String(responseBody)
 										+ " id=" + fileEntry.getFileEntryId());
-								// salvaCampione(fileEntry, fileBytes,
+								salvaCampione(fileEntry, fileBytes, "0-firme");
-								// "0-firme");
 							}
 						}
 					}
 				}
 			} catch (Exception e) {
-				_log.info("Errore", e);
+				if (_log.isDebugEnabled())
+					_log.debug("Errore", e);
+				else
+					_log.error("Errore " + e.getMessage());
 			} finally {
 				lock.unlock();
 			}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java

@@ -12,6 +12,7 @@
 
 package it.tref.liferay.portos.bo.service.impl;
 
+import it.mwg.sismica.bo.util.HttpServiceUtil;
 import it.tref.liferay.portos.bo.NoSuchDettPraticaException;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
@@ -1815,8 +1816,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 	private void updateAsset(DettPratica dettPratica, ServiceContext serviceContext) throws PortalException,
 			SystemException {
 
-		Locale locale = serviceContext.getLocale();
-
 		AssetEntry assetEntry = assetEntryLocalService.updateEntry(dettPratica.getUserId(),
 				dettPratica.getGroupId(), dettPratica.getCreateDate(), dettPratica.getModifiedDate(),
 				DettPratica.class.getName(), dettPratica.getPrimaryKey(), dettPratica.getUuid(), 0L,
@@ -2179,32 +2178,16 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		return dettPratica;
 	}
 
-	public void sendToVersioning(long dettPraticaId, String url) throws PortalException, SystemException,
+	public void sendToVersioning(long dettPraticaId, String url) throws Exception {
-			NoSuchFieldException, SecurityException, IOException {
 
 		DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId);
 		String jsonToVersioning = dettPratica.serializeToVersioning();
 
-		Options options = new Options();
+		JSONObject response = HttpServiceUtil.postJson(url, jsonToVersioning);
-		options.setLocation(url);
+		int version = response.getInt("version");
-		options.setPost(true);
+		dettPratica.setVersion(version);
-		Body body = new Body(jsonToVersioning, ContentTypes.APPLICATION_JSON, "UTF-8");
+		dettPratica.setVersionata(true);
-		options.setBody(body);
+		dettPraticaLocalService.updateDettPratica(dettPratica);
-
-		String responseBody = HttpUtil.URLtoString(options);
-		if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-				|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-			JSONObject response = JSONFactoryUtil.createJSONObject(responseBody);
-			int version = response.getInt("version");
-			dettPratica.setVersion(version);
-			dettPratica.setVersionata(true);
-			dettPraticaLocalService.updateDettPratica(dettPratica);
-
-		} else {
-			throw new PortalException(options.getResponse().getResponseCode() + StringPool.SPACE
-					+ responseBody);
-		}
-
 	}
 
 	public int getNumeroDiVersioni(String url) throws IOException, PortalException, SystemException {
@@ -2233,7 +2216,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		JSONObject snapshot = jsonObjectResponse.getJSONObject("Snapshot");
 		int responseVersion = snapshot.getInt("version");
 		if (responseVersion != version) {
-			_log.error("Le versioni non corrispondono");
+			_log.error("Le versioni non corrispondono " + responseVersion + "/" + version);
 		}
 		JSONObject jsonFields = snapshot.getJSONObject("fields");
 		for (String hiddenField : PraticaUtil.getDettPraticaHiddenFields()) {
@@ -2256,6 +2239,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		} else {
 			_log.error(options.getLocation() + ": " + options.getResponse().getResponseCode());
 		}
+//		return "{\"values\":[],\"Snapshot\":{\"version\":0,\"fields\":{}}}";
 		return StringPool.BLANK;
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java

@@ -480,8 +480,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 
 	}
 
-	public void sendToVersioning(long dettPraticaId, long companyId) throws PortalException, SystemException,
+	public void sendToVersioning(long dettPraticaId, long companyId) throws Exception {
-			NoSuchFieldException, SecurityException, IOException {
 
 		Company company = CompanyLocalServiceUtil.getCompany(companyId);
 		String commitURL = (String) company.getExpandoBridge().getAttribute(

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java

@@ -1,5 +1,6 @@
 package it.tref.liferay.portos.bo.util;
 
+import it.mwg.sismica.bo.util.HttpServiceUtil;
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.DettPratica;
@@ -28,8 +29,6 @@ import java.util.Collections;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVRecord;
@@ -37,16 +36,11 @@ import org.apache.commons.io.IOUtils;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.repository.model.FileEntry;
-import com.liferay.portal.kernel.util.ContentTypes;
 import com.liferay.portal.kernel.util.GetterUtil;
-import com.liferay.portal.kernel.util.Http.Body;
-import com.liferay.portal.kernel.util.Http.Options;
-import com.liferay.portal.kernel.util.HttpUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.StreamUtil;
 import com.liferay.portal.kernel.util.StringPool;
@@ -61,13 +55,6 @@ public class ProtocollazioneUtil {
 
 	private static final Log _log = LogFactoryUtil.getLog(ProtocollazioneUtil.class);
 
-	// public static String protocollaPartenza(DettPratica dettPratica, Avviso
-	// avviso) throws
-	// Exception {
-	//
-	// return protocollaPartenza(dettPratica, avviso, null);
-	// }
-
 	public static String protocollaPartenza(Avviso avviso, Long fileEntryId) throws Exception {
 
 		String protocollo = null;
@@ -100,11 +87,10 @@ public class ProtocollazioneUtil {
 				allegato.setFileSha256(sha256);
 			}
 
-			// utilizzato anche come discriminate tra la 1a e la 2a chiamata
+			// utilizzato anche come discriminate tra la 1a e la 2a chiamata 1a
-			// 1a recupero numero protocollo -> 1 allegato finto
+			// recupero numero protocollo -> 1 allegato finto 2a aggiorno dati
-			// 2a aggiorno dati del documento prodotto -> 2 allegati, il 1o
+			// del documento prodotto -> 2 allegati, il 1o giusto e il 2o per
-			// giusto e il 2o per recupero
+			// recupero num protocollo
-			// num protocollo
 
 			Protocollo protocolloBean = new Protocollo();
 			protocolloBean.setOggetto(generaOggettoProtocollo(avviso.getClassName(), avviso.getAvvisoId()));
@@ -114,17 +100,8 @@ public class ProtocollazioneUtil {
 			protocolloBean.setUfficioId(String.valueOf(groupId));
 			protocolloBean.setPraticaId(String.valueOf(avviso.getClassPk()));
 			protocolloBean.setFiles(Collections.singletonList(allegato));
-			Options options = createCall(avviso.getCompanyId(), protocolloBean, true);
+			JSONObject risposta = HttpServiceUtil.postProtocolloBean(avviso.getCompanyId(), protocolloBean);
-
+			protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-			String responseBody = HttpUtil.URLtoString(options);
-			if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-					|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-				JSONObject risposta = JSONFactoryUtil.createJSONObject(responseBody);
-				protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-			} else {
-				throw new Exception(options.getResponse().getResponseCode() + StringPool.SPACE + responseBody);
-			}
-
 		} finally {
 			StreamUtil.cleanUp(inputStream);
 		}
@@ -134,8 +111,6 @@ public class ProtocollazioneUtil {
 
 	public static String protocollaArrivo(Object praticaInstance, String title) throws Exception {
 
-		String protocollo = null;
-
 		long groupId = 0l;
 		long praticaId = 0l;
 		long companyId = 0l;
@@ -202,25 +177,13 @@ public class ProtocollazioneUtil {
 		protocolloBean.setPraticaId(String.valueOf(praticaId));
 
 		protocolloBean.setFiles(allegati);
-		Options options = createCall(companyId, protocolloBean, true);
+		JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean);
-
+		return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-		String responseBody = HttpUtil.URLtoString(options);
-		if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-				|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-			JSONObject risposta = JSONFactoryUtil.createJSONObject(responseBody);
-			protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-		} else {
-			throw new Exception(options.getResponse().getResponseCode() + StringPool.SPACE + responseBody);
-		}
-
-		return protocollo;
 	}
 
 	public static String protocollaArrivoAccessoAtti(long groupId, long companyId, String userName,
 			long accessoAttiId, String className) throws Exception {
 
-		String protocollo = null;
-
 		List<File> allegati = new ArrayList<File>();
 		File allegato = new File();
 		String doc = String.valueOf(accessoAttiId);
@@ -238,18 +201,8 @@ public class ProtocollazioneUtil {
 		protocolloBean.setPraticaId(String.valueOf(accessoAttiId));
 
 		protocolloBean.setFiles(allegati);
-		Options options = createCall(companyId, protocolloBean, true);
+		JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean);
-
+		return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-		String responseBody = HttpUtil.URLtoString(options);
-		if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-				|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-			JSONObject risposta = JSONFactoryUtil.createJSONObject(responseBody);
-			protocollo = risposta.getString("anno") + String.format("%07d", risposta.getInt("numero"));
-		} else {
-			throw new Exception(options.getResponse().getResponseCode() + StringPool.SPACE + responseBody);
-		}
-
-		return protocollo;
 	}
 
 	public static String generaOggettoProtocollo(String className, long classPk) {
@@ -266,69 +219,6 @@ public class ProtocollazioneUtil {
 		return "Oggetto: " + className + " " + classPk;
 	}
 
-	public static void test() {
-
-		String url = "http://172.16.20.148:8080/portos-protocollazione-service/v1/api-rest/genera-protocollo";
-		// String url =
-		// "http://10.159.51.84:8080/portos-protocollazione-service/v1/api-rest/genera-protocollo";
-		Options options = new Options();
-		options.setLocation(url);
-		options.setPost(true);
-		flexjson.JSONSerializer serialize = new flexjson.JSONSerializer();
-		// JSONSerializer jsonSerializer =
-		// JSONFactoryUtil.createJSONSerializer();
-
-		serialize.exclude("*.class");
-
-		Protocollo protocolloBean = new Protocollo();
-		protocolloBean.setOggetto("oggetto");
-		protocolloBean.setChiuso(false);
-		protocolloBean.setTipo(TipoProtocollo.INGRESSO);
-		protocolloBean.setUtenteId("SSSS");
-		protocolloBean.setUfficioId("genio");
-		String protocollo = serialize.serialize(protocolloBean);
-
-		Body body = new Body(protocollo, ContentTypes.APPLICATION_JSON, "UTF-8");
-		options.setBody(body);
-
-		try {
-			String responseBody = HttpUtil.URLtoString(options);
-
-			if (options.getResponse().getResponseCode() == HttpServletResponse.SC_OK
-					|| options.getResponse().getResponseCode() == HttpServletResponse.SC_CREATED) {
-				System.out.println("ok " + responseBody);
-			} else {
-				System.out.println("error " + responseBody);
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	private static Options createCall(long companyId, Protocollo protocolloBean, boolean post) throws SystemException {
-
-    String url =
-        ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId,
-            ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL);
-
-    Options options = new Options();
-    options.setLocation(url);
-    options.setPost(post);
-
-    flexjson.JSONSerializer serialize = new flexjson.JSONSerializer();
-    serialize.exclude("*.class");
-    String protocollo = serialize.serialize(protocolloBean);
-    Body body = new Body(protocollo, ContentTypes.APPLICATION_JSON, "UTF-8");
-
-    options.setBody(body);
-
-
-    return options;
-
-  }
-
 	public static List<OggettoProtocollo> csvToOggettoProtocollo(java.io.File file)
 			throws FileNotFoundException, IOException, ParseException {
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2405
+    build.number=2426
-    build.date=1600340894413
+    build.date=1600769216546
     build.auto.upgrade=true
 
 ##