From 0858d0eeab960095181b047df6b9191a48c80022 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Tue, 22 Sep 2020 11:21:55 +0200 Subject: [PATCH] Cambio branch --- .../tref/liferay/portos/bo/util/ValidazionePraticaUtil.java | 5 ++--- .../portos/bo/service/impl/DettPraticaLocalServiceImpl.java | 5 +++-- .../portos-bo-portlet/docroot/WEB-INF/src/service.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 36093890..2edc86b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -2480,9 +2480,8 @@ public class ValidazionePraticaUtil { options.setLocation(urlPdfExtractor); options.setPost(true); List fileParts = new ArrayList<>(); - // TODO perché cazzo non funziona il contentType??? - // FilePart filePart = new FilePart("file", fileName, fileBytes, - // ContentType.P7M.getContentType(), "UTF-8"); + // Complimenti all'ignoto autore di questo magnifico TODO + // TODO perché cazzo non funziona il contentType??? FilePart filePart = new FilePart("file", fileName, fileBytes, "application/pkcs7-signature", "UTF-8"); fileParts.add(filePart); options.setFileParts(fileParts); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 23b33a06..3e4ca8d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -2182,7 +2182,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); String jsonToVersioning = dettPratica.serializeToVersioning(); - + JSONObject response = HttpServiceUtil.postJson(url, jsonToVersioning); int version = response.getInt("version"); dettPratica.setVersion(version); @@ -2216,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()) { @@ -2239,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; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 20c457f7..4dd86d5d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/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=2414 - build.date=1600684750317 + build.number=2415 + build.date=1600698455241 build.auto.upgrade=true ##