diff --git a/liferay-plugins-sdk-6.2/build.malde.properties b/liferay-plugins-sdk-6.2/build.malde.properties new file mode 100644 index 00000000..fa2d878f --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.malde.properties @@ -0,0 +1,15 @@ +# Managed by Liferay IDE (remove this comment to prevent future updates) + +#Managed by Liferay IDE (remove this comment to prevent future updates) +#Fri Feb 17 13:42:23 CET 2023 +app.server.tomcat.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext +app.server.tomcat.deploy.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps +app.server.parent.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.tomcat.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT +ant.build.javac.source = 1.7 +ant.build.javac.target = 1.7 + +ivy.version = 2.4.0 +ivy.jar.url = http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar index a375b9f1..a5ecdf96 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index 7eac521e..762b183f 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar index 25459689..65d7add0 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar index e7b32978..9943a924 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar index 7ba36d2d..5ca0a872 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar index a375b9f1..a5ecdf96 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index b003b616..c97d497c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 7eac521e..762b183f 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index 25459689..65d7add0 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index e7b32978..9943a924 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index 7ba36d2d..5ca0a872 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 71c87d03..a10cf07e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -835,6 +835,9 @@ + + + @@ -858,6 +861,11 @@ + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java index 28804b05..b0c4169d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java @@ -112,6 +112,9 @@ public class IntPraticaClp extends BaseModelImpl attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); attributes.put("inLavorazioneSue", getInLavorazioneSue()); + attributes.put("sueSuapInstanceId", getSueSuapInstanceId()); + attributes.put("sueSuapClientId", getSueSuapClientId()); + attributes.put("sueSuapIpaCode", getSueSuapIpaCode()); return attributes; } @@ -326,6 +329,24 @@ public class IntPraticaClp extends BaseModelImpl if (inLavorazioneSue != null) { setInLavorazioneSue(inLavorazioneSue); } + + String sueSuapInstanceId = (String)attributes.get("sueSuapInstanceId"); + + if (sueSuapInstanceId != null) { + setSueSuapInstanceId(sueSuapInstanceId); + } + + String sueSuapClientId = (String)attributes.get("sueSuapClientId"); + + if (sueSuapClientId != null) { + setSueSuapClientId(sueSuapClientId); + } + + String sueSuapIpaCode = (String)attributes.get("sueSuapIpaCode"); + + if (sueSuapIpaCode != null) { + setSueSuapIpaCode(sueSuapIpaCode); + } } @Override @@ -1185,6 +1206,78 @@ public class IntPraticaClp extends BaseModelImpl } } + @Override + public String getSueSuapInstanceId() { + return _sueSuapInstanceId; + } + + @Override + public void setSueSuapInstanceId(String sueSuapInstanceId) { + _sueSuapInstanceId = sueSuapInstanceId; + + if (_intPraticaRemoteModel != null) { + try { + Class clazz = _intPraticaRemoteModel.getClass(); + + Method method = clazz.getMethod("setSueSuapInstanceId", + String.class); + + method.invoke(_intPraticaRemoteModel, sueSuapInstanceId); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + + @Override + public String getSueSuapClientId() { + return _sueSuapClientId; + } + + @Override + public void setSueSuapClientId(String sueSuapClientId) { + _sueSuapClientId = sueSuapClientId; + + if (_intPraticaRemoteModel != null) { + try { + Class clazz = _intPraticaRemoteModel.getClass(); + + Method method = clazz.getMethod("setSueSuapClientId", + String.class); + + method.invoke(_intPraticaRemoteModel, sueSuapClientId); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + + @Override + public String getSueSuapIpaCode() { + return _sueSuapIpaCode; + } + + @Override + public void setSueSuapIpaCode(String sueSuapIpaCode) { + _sueSuapIpaCode = sueSuapIpaCode; + + if (_intPraticaRemoteModel != null) { + try { + Class clazz = _intPraticaRemoteModel.getClass(); + + Method method = clazz.getMethod("setSueSuapIpaCode", + String.class); + + method.invoke(_intPraticaRemoteModel, sueSuapIpaCode); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + @Override public boolean canEditPratica() { try { @@ -2318,6 +2411,9 @@ public class IntPraticaClp extends BaseModelImpl clone.setCollaudoTotale(getCollaudoTotale()); clone.setControlloObbligatorio(getControlloObbligatorio()); clone.setInLavorazioneSue(getInLavorazioneSue()); + clone.setSueSuapInstanceId(getSueSuapInstanceId()); + clone.setSueSuapClientId(getSueSuapClientId()); + clone.setSueSuapIpaCode(getSueSuapIpaCode()); return clone; } @@ -2370,7 +2466,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(75); sb.append("{uuid="); sb.append(getUuid()); @@ -2440,6 +2536,12 @@ public class IntPraticaClp extends BaseModelImpl sb.append(getControlloObbligatorio()); sb.append(", inLavorazioneSue="); sb.append(getInLavorazioneSue()); + sb.append(", sueSuapInstanceId="); + sb.append(getSueSuapInstanceId()); + sb.append(", sueSuapClientId="); + sb.append(getSueSuapClientId()); + sb.append(", sueSuapIpaCode="); + sb.append(getSueSuapIpaCode()); sb.append("}"); return sb.toString(); @@ -2447,7 +2549,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(106); + StringBundler sb = new StringBundler(115); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -2589,6 +2691,18 @@ public class IntPraticaClp extends BaseModelImpl "inLavorazioneSue"); + sb.append( + "sueSuapInstanceId"); + sb.append( + "sueSuapClientId"); + sb.append( + "sueSuapIpaCode"); sb.append(""); @@ -2631,6 +2745,9 @@ public class IntPraticaClp extends BaseModelImpl private boolean _collaudoTotale; private boolean _controlloObbligatorio; private boolean _inLavorazioneSue; + private String _sueSuapInstanceId; + private String _sueSuapClientId; + private String _sueSuapIpaCode; private BaseModel _intPraticaRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java index ee400e4d..0c94da4c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java @@ -650,6 +650,51 @@ public interface IntPraticaModel extends BaseModel, */ public void setInLavorazioneSue(boolean inLavorazioneSue); + /** + * Returns the sue suap instance ID of this int pratica. + * + * @return the sue suap instance ID of this int pratica + */ + @AutoEscape + public String getSueSuapInstanceId(); + + /** + * Sets the sue suap instance ID of this int pratica. + * + * @param sueSuapInstanceId the sue suap instance ID of this int pratica + */ + public void setSueSuapInstanceId(String sueSuapInstanceId); + + /** + * Returns the sue suap client ID of this int pratica. + * + * @return the sue suap client ID of this int pratica + */ + @AutoEscape + public String getSueSuapClientId(); + + /** + * Sets the sue suap client ID of this int pratica. + * + * @param sueSuapClientId the sue suap client ID of this int pratica + */ + public void setSueSuapClientId(String sueSuapClientId); + + /** + * Returns the sue suap ipa code of this int pratica. + * + * @return the sue suap ipa code of this int pratica + */ + @AutoEscape + public String getSueSuapIpaCode(); + + /** + * Sets the sue suap ipa code of this int pratica. + * + * @param sueSuapIpaCode the sue suap ipa code of this int pratica + */ + public void setSueSuapIpaCode(String sueSuapIpaCode); + @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java index 51079137..2e121c1b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java @@ -65,6 +65,9 @@ public class IntPraticaSoap implements Serializable { soapModel.setCollaudoTotale(model.getCollaudoTotale()); soapModel.setControlloObbligatorio(model.getControlloObbligatorio()); soapModel.setInLavorazioneSue(model.getInLavorazioneSue()); + soapModel.setSueSuapInstanceId(model.getSueSuapInstanceId()); + soapModel.setSueSuapClientId(model.getSueSuapClientId()); + soapModel.setSueSuapIpaCode(model.getSueSuapIpaCode()); return soapModel; } @@ -423,6 +426,30 @@ public class IntPraticaSoap implements Serializable { _inLavorazioneSue = inLavorazioneSue; } + public String getSueSuapInstanceId() { + return _sueSuapInstanceId; + } + + public void setSueSuapInstanceId(String sueSuapInstanceId) { + _sueSuapInstanceId = sueSuapInstanceId; + } + + public String getSueSuapClientId() { + return _sueSuapClientId; + } + + public void setSueSuapClientId(String sueSuapClientId) { + _sueSuapClientId = sueSuapClientId; + } + + public String getSueSuapIpaCode() { + return _sueSuapIpaCode; + } + + public void setSueSuapIpaCode(String sueSuapIpaCode) { + _sueSuapIpaCode = sueSuapIpaCode; + } + private String _uuid; private long _intPraticaId; private long _companyId; @@ -457,4 +484,7 @@ public class IntPraticaSoap implements Serializable { private boolean _collaudoTotale; private boolean _controlloObbligatorio; private boolean _inLavorazioneSue; + private String _sueSuapInstanceId; + private String _sueSuapClientId; + private String _sueSuapIpaCode; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java index 3d99233a..9f30a341 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java @@ -86,6 +86,9 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); attributes.put("inLavorazioneSue", getInLavorazioneSue()); + attributes.put("sueSuapInstanceId", getSueSuapInstanceId()); + attributes.put("sueSuapClientId", getSueSuapClientId()); + attributes.put("sueSuapIpaCode", getSueSuapIpaCode()); return attributes; } @@ -300,6 +303,24 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { if (inLavorazioneSue != null) { setInLavorazioneSue(inLavorazioneSue); } + + String sueSuapInstanceId = (String)attributes.get("sueSuapInstanceId"); + + if (sueSuapInstanceId != null) { + setSueSuapInstanceId(sueSuapInstanceId); + } + + String sueSuapClientId = (String)attributes.get("sueSuapClientId"); + + if (sueSuapClientId != null) { + setSueSuapClientId(sueSuapClientId); + } + + String sueSuapIpaCode = (String)attributes.get("sueSuapIpaCode"); + + if (sueSuapIpaCode != null) { + setSueSuapIpaCode(sueSuapIpaCode); + } } /** @@ -1128,6 +1149,66 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { _intPratica.setInLavorazioneSue(inLavorazioneSue); } + /** + * Returns the sue suap instance ID of this int pratica. + * + * @return the sue suap instance ID of this int pratica + */ + @Override + public java.lang.String getSueSuapInstanceId() { + return _intPratica.getSueSuapInstanceId(); + } + + /** + * Sets the sue suap instance ID of this int pratica. + * + * @param sueSuapInstanceId the sue suap instance ID of this int pratica + */ + @Override + public void setSueSuapInstanceId(java.lang.String sueSuapInstanceId) { + _intPratica.setSueSuapInstanceId(sueSuapInstanceId); + } + + /** + * Returns the sue suap client ID of this int pratica. + * + * @return the sue suap client ID of this int pratica + */ + @Override + public java.lang.String getSueSuapClientId() { + return _intPratica.getSueSuapClientId(); + } + + /** + * Sets the sue suap client ID of this int pratica. + * + * @param sueSuapClientId the sue suap client ID of this int pratica + */ + @Override + public void setSueSuapClientId(java.lang.String sueSuapClientId) { + _intPratica.setSueSuapClientId(sueSuapClientId); + } + + /** + * Returns the sue suap ipa code of this int pratica. + * + * @return the sue suap ipa code of this int pratica + */ + @Override + public java.lang.String getSueSuapIpaCode() { + return _intPratica.getSueSuapIpaCode(); + } + + /** + * Sets the sue suap ipa code of this int pratica. + * + * @param sueSuapIpaCode the sue suap ipa code of this int pratica + */ + @Override + public void setSueSuapIpaCode(java.lang.String sueSuapIpaCode) { + _intPratica.setSueSuapIpaCode(sueSuapIpaCode); + } + @Override public boolean isNew() { return _intPratica.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index b916845f..be1b3075 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -457,6 +457,11 @@ public interface IntPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException; + public java.util.List findByCompanyIdSoggettoAltriProgetti( long companyId, long soggettoId, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index b493db0c..52fc45a1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -271,149 +271,153 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { _methodParameterTypes51 = new String[] { "long", "long" }; - _methodName52 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName52 = "fetchByIntPraticaId_SueSuapInstanceId"; - _methodParameterTypes52 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes52 = new String[] { "long", "java.lang.String" }; - _methodName53 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName53 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes53 = new String[] { "long", "long" }; + _methodParameterTypes53 = new String[] { "long", "long", "int", "int" }; - _methodName54 = "findByCanAddFineLavori"; + _methodName54 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes54 = new String[] { + _methodParameterTypes54 = new String[] { "long", "long" }; + + _methodName55 = "findByCanAddFineLavori"; + + _methodParameterTypes55 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName55 = "countByCanAddFineLavori"; + _methodName56 = "countByCanAddFineLavori"; - _methodParameterTypes55 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes56 = new String[] { "long", "java.lang.String" }; - _methodName56 = "findByCanAddCollaudo"; + _methodName57 = "findByCanAddCollaudo"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes57 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName57 = "countByCanAddCollaudo"; + _methodName58 = "countByCanAddCollaudo"; - _methodParameterTypes57 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes58 = new String[] { "long", "java.lang.String" }; - _methodName58 = "search"; + _methodName59 = "search"; - _methodParameterTypes58 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes59 = new String[] { "java.util.List", "int", "int" }; - _methodName59 = "countSearch"; + _methodName60 = "countSearch"; - _methodParameterTypes59 = new String[] { "java.util.List" }; + _methodParameterTypes60 = new String[] { "java.util.List" }; - _methodName60 = "searchWithIntPraticaId"; + _methodName61 = "searchWithIntPraticaId"; - _methodParameterTypes60 = new String[] { + _methodParameterTypes61 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName61 = "allegaFileAnnullamento"; + _methodName62 = "allegaFileAnnullamento"; - _methodParameterTypes61 = new String[] { + _methodParameterTypes62 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName62 = "generateFileAnnullamento"; + _methodName63 = "generateFileAnnullamento"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes63 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName63 = "deleteFileAnnullamento"; + _methodName64 = "deleteFileAnnullamento"; - _methodParameterTypes63 = new String[] { "long" }; + _methodParameterTypes64 = new String[] { "long" }; - _methodName64 = "completeAnnullamento"; + _methodName65 = "completeAnnullamento"; - _methodParameterTypes64 = new String[] { "long" }; + _methodParameterTypes65 = new String[] { "long" }; - _methodName65 = "cambiaIstruttore"; + _methodName66 = "cambiaIstruttore"; - _methodParameterTypes65 = new String[] { "long", "long", "long" }; + _methodParameterTypes66 = new String[] { "long", "long", "long" }; - _methodName66 = "countCaricoLavoroCF"; + _methodName67 = "countCaricoLavoroCF"; - _methodParameterTypes66 = new String[] { + _methodParameterTypes67 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName67 = "countCaricoLavoroIstruttore"; + _methodName68 = "countCaricoLavoroIstruttore"; - _methodParameterTypes67 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes68 = new String[] { "long", "java.lang.String" }; - _methodName68 = "generateReportPratica"; + _methodName69 = "generateReportPratica"; - _methodParameterTypes68 = new String[] { + _methodParameterTypes69 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName69 = "updateModifiedDate"; + _methodName70 = "updateModifiedDate"; - _methodParameterTypes69 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes70 = new String[] { "long", "java.util.Date" }; - _methodName70 = "reIndexFascicolo"; + _methodName71 = "reIndexFascicolo"; - _methodParameterTypes70 = new String[] { + _methodParameterTypes71 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName71 = "reIndexFasciolo"; - - _methodParameterTypes71 = new String[] { "java.lang.String", "long" }; - _methodName72 = "reIndexFasciolo"; - _methodParameterTypes72 = new String[] { "long", "long" }; + _methodParameterTypes72 = new String[] { "java.lang.String", "long" }; - _methodName73 = "findByNumeroProgetto"; + _methodName73 = "reIndexFasciolo"; - _methodParameterTypes73 = new String[] { "java.lang.String" }; + _methodParameterTypes73 = new String[] { "long", "long" }; - _methodName74 = "findByTerritorioId"; + _methodName74 = "findByNumeroProgetto"; - _methodParameterTypes74 = new String[] { "long" }; + _methodParameterTypes74 = new String[] { "java.lang.String" }; - _methodName75 = "getOrganizationByIntPraticaId"; + _methodName75 = "findByTerritorioId"; _methodParameterTypes75 = new String[] { "long" }; - _methodName76 = "hasRichiestaIntegrazioneAttiva"; + _methodName76 = "getOrganizationByIntPraticaId"; _methodParameterTypes76 = new String[] { "long" }; - _methodName77 = "invioMailNotifica"; + _methodName77 = "hasRichiestaIntegrazioneAttiva"; + + _methodParameterTypes77 = new String[] { "long" }; - _methodParameterTypes77 = new String[] { + _methodName78 = "invioMailNotifica"; + + _methodParameterTypes78 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName78 = "searchAltriProgetti"; + _methodName79 = "searchAltriProgetti"; - _methodParameterTypes78 = new String[] { + _methodParameterTypes79 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName79 = "searchArchivioProgetti"; + _methodName80 = "searchArchivioProgetti"; - _methodParameterTypes79 = new String[] { + _methodParameterTypes80 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName80 = "searchMieiProgetti"; + _methodName81 = "searchMieiProgetti"; - _methodParameterTypes80 = new String[] { + _methodParameterTypes81 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -2119,6 +2123,40 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { return ((Integer)returnObj).intValue(); } + @Override + public it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, + new Object[] { + intPraticaId, + + ClpSerializer.translateInput(sueSuapInstanceId) + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (it.tref.liferay.portos.bo.model.IntPratica)ClpSerializer.translateOutput(returnObj); + } + @Override public java.util.List findByCompanyIdSoggettoAltriProgetti( long companyId, long soggettoId, int start, int end) @@ -2127,8 +2165,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { companyId, soggettoId, start, end }); } catch (Throwable t) { @@ -2162,8 +2200,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2197,8 +2235,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { companyId, @@ -2240,8 +2278,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { companyId, @@ -2279,8 +2317,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { companyId, @@ -2322,8 +2360,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { companyId, @@ -2360,8 +2398,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2395,8 +2433,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2425,8 +2463,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, + returnObj = _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2467,8 +2505,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { intPraticaId, @@ -2518,8 +2556,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { intPraticaId, @@ -2558,8 +2596,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2588,8 +2626,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2618,8 +2656,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2651,8 +2689,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { ispettoreId, @@ -2691,8 +2729,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { ispettoreId, @@ -2726,8 +2764,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2765,8 +2803,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { intPraticaId, @@ -2800,8 +2838,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica pratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, + _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { ClpSerializer.translateInput(pratica), companyId }); } catch (Throwable t) { @@ -2821,8 +2859,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFasciolo(java.lang.String numeroProgetto, long companyId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, + _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -2851,8 +2889,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -2883,8 +2921,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -2913,8 +2951,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2943,8 +2981,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2974,8 +3012,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3003,8 +3041,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, + _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { dettPraticaId, @@ -3055,8 +3093,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, + returnObj = _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { ClpSerializer.translateInput(request), @@ -3089,8 +3127,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName79, - _methodParameterTypes79, + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, new Object[] { ClpSerializer.translateInput(request), @@ -3123,8 +3161,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { ClpSerializer.translateInput(request), @@ -3311,4 +3349,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes79; private String _methodName80; private String[] _methodParameterTypes80; + private String _methodName81; + private String[] _methodParameterTypes81; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index 6e2e1703..100f6a75 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -546,6 +546,14 @@ public class IntPraticaLocalServiceUtil { .countByCompanyIdSoggettoArchivio(companyId, soggettoId); } + public static it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService() + .fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + public static java.util.List findByCompanyIdSoggettoAltriProgetti( long companyId, long soggettoId, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 5600b27d..bfc8f1c1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -597,6 +597,14 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, soggettoId); } + @Override + public it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + @Override public java.util.List findByCompanyIdSoggettoAltriProgetti( long companyId, long soggettoId, int start, int end) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java index 30708552..6ebe700e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java @@ -1184,6 +1184,71 @@ public interface IntPraticaPersistence extends BasePersistence { public int countByStatoPratica(java.lang.String statoPratica) throws com.liferay.portal.kernel.exception.SystemException; + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchIntPraticaException} if it could not be found. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica findByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException; + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found. Uses the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found, optionally using the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @param retrieveFromCache whether to use the finder cache + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId, + boolean retrieveFromCache) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Removes the int pratica where intPraticaId = ? and sueSuapInstanceId = ? from the database. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the int pratica that was removed + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica removeByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException; + + /** + * Returns the number of int praticas where intPraticaId = ? and sueSuapInstanceId = ?. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + public int countByIntPraticaId_SueSuapInstanceId(long intPraticaId, + java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException; + /** * Caches the int pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java index 704dd59b..0b5f8d57 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java @@ -1469,6 +1469,91 @@ public class IntPraticaUtil { return getPersistence().countByStatoPratica(statoPratica); } + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchIntPraticaException} if it could not be found. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica findByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException { + return getPersistence() + .findByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found. Uses the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found, optionally using the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @param retrieveFromCache whether to use the finder cache + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica fetchByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId, + boolean retrieveFromCache) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId, retrieveFromCache); + } + + /** + * Removes the int pratica where intPraticaId = ? and sueSuapInstanceId = ? from the database. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the int pratica that was removed + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica removeByIntPraticaId_SueSuapInstanceId( + long intPraticaId, java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException { + return getPersistence() + .removeByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + + /** + * Returns the number of int praticas where intPraticaId = ? and sueSuapInstanceId = ?. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + public static int countByIntPraticaId_SueSuapInstanceId(long intPraticaId, + java.lang.String sueSuapInstanceId) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .countByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + } + /** * Caches the int pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties index 46b06813..4e5a3188 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties @@ -152,6 +152,7 @@ IX_BAD23F73=portos_bo_HistoryWorkflowAction.IntPraticaAndDettPratica IX_9929E083=portos_bo_IntPratica.C_Group IX_E75F8D41=portos_bo_IntPratica.C_UserId +IX_6A47801=portos_bo_IntPratica.IntPraticaId_SueSuapInstanceId IX_779B836B=portos_bo_IntPratica.P IX_ACF2D38C=portos_bo_IntPratica.StatoPratica IX_4736A755=portos_bo_IntPratica.TerritorioId diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql index 68cd3455..4422de69 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql @@ -149,6 +149,7 @@ create index IX_BAD23F73 on portos_bo_HistoryWorkflowAction (intPraticaId, dettP create index IX_9929E083 on portos_bo_IntPratica (companyId, groupId); create index IX_E75F8D41 on portos_bo_IntPratica (companyId, userId); +create unique index IX_6A47801 on portos_bo_IntPratica (intPraticaId, sueSuapInstanceId); create index IX_ACF2D38C on portos_bo_IntPratica (statoPratica); create index IX_779B836B on portos_bo_IntPratica (status, dtPratica); create index IX_4736A755 on portos_bo_IntPratica (territorioId); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index 44478cc8..d7473cf2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -555,7 +555,10 @@ create table portos_bo_IntPratica ( collaudoParziale BOOLEAN, collaudoTotale BOOLEAN, controlloObbligatorio BOOLEAN, - inLavorazioneSue BOOLEAN + inLavorazioneSue BOOLEAN, + sueSuapInstanceId VARCHAR(75) null, + sueSuapClientId VARCHAR(75) null, + sueSuapIpaCode VARCHAR(75) null ); create table portos_bo_Pagamento ( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index 3278abef..99b997c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -608,6 +608,9 @@ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index 55152c98..48401617 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -656,6 +656,9 @@ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 212601b4..e476d031 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -781,6 +781,9 @@ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java index ec9dd4f3..92a16310 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java @@ -38,7 +38,7 @@ public class IntPraticaCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(75); sb.append("{uuid="); sb.append(uuid); @@ -108,6 +108,12 @@ public class IntPraticaCacheModel implements CacheModel, sb.append(controlloObbligatorio); sb.append(", inLavorazioneSue="); sb.append(inLavorazioneSue); + sb.append(", sueSuapInstanceId="); + sb.append(sueSuapInstanceId); + sb.append(", sueSuapClientId="); + sb.append(sueSuapClientId); + sb.append(", sueSuapIpaCode="); + sb.append(sueSuapIpaCode); sb.append("}"); return sb.toString(); @@ -244,6 +250,27 @@ public class IntPraticaCacheModel implements CacheModel, intPraticaImpl.setControlloObbligatorio(controlloObbligatorio); intPraticaImpl.setInLavorazioneSue(inLavorazioneSue); + if (sueSuapInstanceId == null) { + intPraticaImpl.setSueSuapInstanceId(StringPool.BLANK); + } + else { + intPraticaImpl.setSueSuapInstanceId(sueSuapInstanceId); + } + + if (sueSuapClientId == null) { + intPraticaImpl.setSueSuapClientId(StringPool.BLANK); + } + else { + intPraticaImpl.setSueSuapClientId(sueSuapClientId); + } + + if (sueSuapIpaCode == null) { + intPraticaImpl.setSueSuapIpaCode(StringPool.BLANK); + } + else { + intPraticaImpl.setSueSuapIpaCode(sueSuapIpaCode); + } + intPraticaImpl.resetOriginalValues(); return intPraticaImpl; @@ -285,6 +312,9 @@ public class IntPraticaCacheModel implements CacheModel, collaudoTotale = objectInput.readBoolean(); controlloObbligatorio = objectInput.readBoolean(); inLavorazioneSue = objectInput.readBoolean(); + sueSuapInstanceId = objectInput.readUTF(); + sueSuapClientId = objectInput.readUTF(); + sueSuapIpaCode = objectInput.readUTF(); } @Override @@ -377,6 +407,27 @@ public class IntPraticaCacheModel implements CacheModel, objectOutput.writeBoolean(collaudoTotale); objectOutput.writeBoolean(controlloObbligatorio); objectOutput.writeBoolean(inLavorazioneSue); + + if (sueSuapInstanceId == null) { + objectOutput.writeUTF(StringPool.BLANK); + } + else { + objectOutput.writeUTF(sueSuapInstanceId); + } + + if (sueSuapClientId == null) { + objectOutput.writeUTF(StringPool.BLANK); + } + else { + objectOutput.writeUTF(sueSuapClientId); + } + + if (sueSuapIpaCode == null) { + objectOutput.writeUTF(StringPool.BLANK); + } + else { + objectOutput.writeUTF(sueSuapIpaCode); + } } public String uuid; @@ -413,4 +464,7 @@ public class IntPraticaCacheModel implements CacheModel, public boolean collaudoTotale; public boolean controlloObbligatorio; public boolean inLavorazioneSue; + public String sueSuapInstanceId; + public String sueSuapClientId; + public String sueSuapIpaCode; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java index 3d8cf303..34a65cb0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java @@ -100,9 +100,12 @@ public class IntPraticaModelImpl extends BaseModelImpl { "collaudoParziale", Types.BOOLEAN }, { "collaudoTotale", Types.BOOLEAN }, { "controlloObbligatorio", Types.BOOLEAN }, - { "inLavorazioneSue", Types.BOOLEAN } + { "inLavorazioneSue", Types.BOOLEAN }, + { "sueSuapInstanceId", Types.VARCHAR }, + { "sueSuapClientId", Types.VARCHAR }, + { "sueSuapIpaCode", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,latitudine DOUBLE,longitudine DOUBLE,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,unitaOperativa INTEGER,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,sospesa BOOLEAN,dtSospensione DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN,inLavorazioneSue BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,latitudine DOUBLE,longitudine DOUBLE,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,unitaOperativa INTEGER,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,sospesa BOOLEAN,dtSospensione DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN,inLavorazioneSue BOOLEAN,sueSuapInstanceId VARCHAR(75) null,sueSuapClientId VARCHAR(75) null,sueSuapIpaCode VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_IntPratica"; public static final String ORDER_BY_JPQL = " ORDER BY intPratica.intPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_IntPratica.intPraticaId ASC"; @@ -121,12 +124,13 @@ public class IntPraticaModelImpl extends BaseModelImpl public static long COMPANYID_COLUMN_BITMASK = 1L; public static long DTPRATICA_COLUMN_BITMASK = 2L; public static long GROUPID_COLUMN_BITMASK = 4L; - public static long STATOPRATICA_COLUMN_BITMASK = 8L; - public static long STATUS_COLUMN_BITMASK = 16L; - public static long TERRITORIOID_COLUMN_BITMASK = 32L; - public static long USERID_COLUMN_BITMASK = 64L; - public static long UUID_COLUMN_BITMASK = 128L; - public static long INTPRATICAID_COLUMN_BITMASK = 256L; + public static long INTPRATICAID_COLUMN_BITMASK = 8L; + public static long STATOPRATICA_COLUMN_BITMASK = 16L; + public static long STATUS_COLUMN_BITMASK = 32L; + public static long SUESUAPINSTANCEID_COLUMN_BITMASK = 64L; + public static long TERRITORIOID_COLUMN_BITMASK = 128L; + public static long USERID_COLUMN_BITMASK = 256L; + public static long UUID_COLUMN_BITMASK = 512L; /** * Converts the soap model instance into a normal model instance. @@ -175,6 +179,9 @@ public class IntPraticaModelImpl extends BaseModelImpl model.setCollaudoTotale(soapModel.getCollaudoTotale()); model.setControlloObbligatorio(soapModel.getControlloObbligatorio()); model.setInLavorazioneSue(soapModel.getInLavorazioneSue()); + model.setSueSuapInstanceId(soapModel.getSueSuapInstanceId()); + model.setSueSuapClientId(soapModel.getSueSuapClientId()); + model.setSueSuapIpaCode(soapModel.getSueSuapIpaCode()); return model; } @@ -275,6 +282,9 @@ public class IntPraticaModelImpl extends BaseModelImpl attributes.put("collaudoTotale", getCollaudoTotale()); attributes.put("controlloObbligatorio", getControlloObbligatorio()); attributes.put("inLavorazioneSue", getInLavorazioneSue()); + attributes.put("sueSuapInstanceId", getSueSuapInstanceId()); + attributes.put("sueSuapClientId", getSueSuapClientId()); + attributes.put("sueSuapIpaCode", getSueSuapIpaCode()); return attributes; } @@ -489,6 +499,24 @@ public class IntPraticaModelImpl extends BaseModelImpl if (inLavorazioneSue != null) { setInLavorazioneSue(inLavorazioneSue); } + + String sueSuapInstanceId = (String)attributes.get("sueSuapInstanceId"); + + if (sueSuapInstanceId != null) { + setSueSuapInstanceId(sueSuapInstanceId); + } + + String sueSuapClientId = (String)attributes.get("sueSuapClientId"); + + if (sueSuapClientId != null) { + setSueSuapClientId(sueSuapClientId); + } + + String sueSuapIpaCode = (String)attributes.get("sueSuapIpaCode"); + + if (sueSuapIpaCode != null) { + setSueSuapIpaCode(sueSuapIpaCode); + } } @JSON @@ -523,9 +551,21 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public void setIntPraticaId(long intPraticaId) { + _columnBitmask |= INTPRATICAID_COLUMN_BITMASK; + + if (!_setOriginalIntPraticaId) { + _setOriginalIntPraticaId = true; + + _originalIntPraticaId = _intPraticaId; + } + _intPraticaId = intPraticaId; } + public long getOriginalIntPraticaId() { + return _originalIntPraticaId; + } + @JSON @Override public long getCompanyId() { @@ -1056,6 +1096,64 @@ public class IntPraticaModelImpl extends BaseModelImpl _inLavorazioneSue = inLavorazioneSue; } + @JSON + @Override + public String getSueSuapInstanceId() { + if (_sueSuapInstanceId == null) { + return StringPool.BLANK; + } + else { + return _sueSuapInstanceId; + } + } + + @Override + public void setSueSuapInstanceId(String sueSuapInstanceId) { + _columnBitmask |= SUESUAPINSTANCEID_COLUMN_BITMASK; + + if (_originalSueSuapInstanceId == null) { + _originalSueSuapInstanceId = _sueSuapInstanceId; + } + + _sueSuapInstanceId = sueSuapInstanceId; + } + + public String getOriginalSueSuapInstanceId() { + return GetterUtil.getString(_originalSueSuapInstanceId); + } + + @JSON + @Override + public String getSueSuapClientId() { + if (_sueSuapClientId == null) { + return StringPool.BLANK; + } + else { + return _sueSuapClientId; + } + } + + @Override + public void setSueSuapClientId(String sueSuapClientId) { + _sueSuapClientId = sueSuapClientId; + } + + @JSON + @Override + public String getSueSuapIpaCode() { + if (_sueSuapIpaCode == null) { + return StringPool.BLANK; + } + else { + return _sueSuapIpaCode; + } + } + + @Override + public void setSueSuapIpaCode(String sueSuapIpaCode) { + _sueSuapIpaCode = sueSuapIpaCode; + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -1127,6 +1225,9 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaImpl.setCollaudoTotale(getCollaudoTotale()); intPraticaImpl.setControlloObbligatorio(getControlloObbligatorio()); intPraticaImpl.setInLavorazioneSue(getInLavorazioneSue()); + intPraticaImpl.setSueSuapInstanceId(getSueSuapInstanceId()); + intPraticaImpl.setSueSuapClientId(getSueSuapClientId()); + intPraticaImpl.setSueSuapIpaCode(getSueSuapIpaCode()); intPraticaImpl.resetOriginalValues(); @@ -1181,6 +1282,10 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaModelImpl._originalUuid = intPraticaModelImpl._uuid; + intPraticaModelImpl._originalIntPraticaId = intPraticaModelImpl._intPraticaId; + + intPraticaModelImpl._setOriginalIntPraticaId = false; + intPraticaModelImpl._originalCompanyId = intPraticaModelImpl._companyId; intPraticaModelImpl._setOriginalCompanyId = false; @@ -1205,6 +1310,8 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaModelImpl._originalDtPratica = intPraticaModelImpl._dtPratica; + intPraticaModelImpl._originalSueSuapInstanceId = intPraticaModelImpl._sueSuapInstanceId; + intPraticaModelImpl._columnBitmask = 0; } @@ -1372,12 +1479,36 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaCacheModel.inLavorazioneSue = getInLavorazioneSue(); + intPraticaCacheModel.sueSuapInstanceId = getSueSuapInstanceId(); + + String sueSuapInstanceId = intPraticaCacheModel.sueSuapInstanceId; + + if ((sueSuapInstanceId != null) && (sueSuapInstanceId.length() == 0)) { + intPraticaCacheModel.sueSuapInstanceId = null; + } + + intPraticaCacheModel.sueSuapClientId = getSueSuapClientId(); + + String sueSuapClientId = intPraticaCacheModel.sueSuapClientId; + + if ((sueSuapClientId != null) && (sueSuapClientId.length() == 0)) { + intPraticaCacheModel.sueSuapClientId = null; + } + + intPraticaCacheModel.sueSuapIpaCode = getSueSuapIpaCode(); + + String sueSuapIpaCode = intPraticaCacheModel.sueSuapIpaCode; + + if ((sueSuapIpaCode != null) && (sueSuapIpaCode.length() == 0)) { + intPraticaCacheModel.sueSuapIpaCode = null; + } + return intPraticaCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(75); sb.append("{uuid="); sb.append(getUuid()); @@ -1447,6 +1578,12 @@ public class IntPraticaModelImpl extends BaseModelImpl sb.append(getControlloObbligatorio()); sb.append(", inLavorazioneSue="); sb.append(getInLavorazioneSue()); + sb.append(", sueSuapInstanceId="); + sb.append(getSueSuapInstanceId()); + sb.append(", sueSuapClientId="); + sb.append(getSueSuapClientId()); + sb.append(", sueSuapIpaCode="); + sb.append(getSueSuapIpaCode()); sb.append("}"); return sb.toString(); @@ -1454,7 +1591,7 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(106); + StringBundler sb = new StringBundler(115); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -1596,6 +1733,18 @@ public class IntPraticaModelImpl extends BaseModelImpl "inLavorazioneSue"); + sb.append( + "sueSuapInstanceId"); + sb.append( + "sueSuapClientId"); + sb.append( + "sueSuapIpaCode"); sb.append(""); @@ -1609,6 +1758,8 @@ public class IntPraticaModelImpl extends BaseModelImpl private String _uuid; private String _originalUuid; private long _intPraticaId; + private long _originalIntPraticaId; + private boolean _setOriginalIntPraticaId; private long _companyId; private long _originalCompanyId; private boolean _setOriginalCompanyId; @@ -1655,6 +1806,10 @@ public class IntPraticaModelImpl extends BaseModelImpl private boolean _collaudoTotale; private boolean _controlloObbligatorio; private boolean _inLavorazioneSue; + private String _sueSuapInstanceId; + private String _originalSueSuapInstanceId; + private String _sueSuapClientId; + private String _sueSuapIpaCode; private long _columnBitmask; private IntPratica _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java index 686972dc..e595c48b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java @@ -280,149 +280,153 @@ public class IntPraticaLocalServiceClpInvoker { _methodParameterTypes210 = new String[] { "long", "long" }; - _methodName212 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName212 = "fetchByIntPraticaId_SueSuapInstanceId"; - _methodParameterTypes212 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes212 = new String[] { "long", "java.lang.String" }; - _methodName213 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName213 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes213 = new String[] { "long", "long" }; + _methodParameterTypes213 = new String[] { "long", "long", "int", "int" }; - _methodName215 = "findByCanAddFineLavori"; + _methodName214 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes215 = new String[] { + _methodParameterTypes214 = new String[] { "long", "long" }; + + _methodName216 = "findByCanAddFineLavori"; + + _methodParameterTypes216 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName216 = "countByCanAddFineLavori"; + _methodName217 = "countByCanAddFineLavori"; - _methodParameterTypes216 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes217 = new String[] { "long", "java.lang.String" }; - _methodName218 = "findByCanAddCollaudo"; + _methodName219 = "findByCanAddCollaudo"; - _methodParameterTypes218 = new String[] { + _methodParameterTypes219 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName219 = "countByCanAddCollaudo"; + _methodName220 = "countByCanAddCollaudo"; - _methodParameterTypes219 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes220 = new String[] { "long", "java.lang.String" }; - _methodName220 = "search"; + _methodName221 = "search"; - _methodParameterTypes220 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes221 = new String[] { "java.util.List", "int", "int" }; - _methodName221 = "countSearch"; + _methodName222 = "countSearch"; - _methodParameterTypes221 = new String[] { "java.util.List" }; + _methodParameterTypes222 = new String[] { "java.util.List" }; - _methodName222 = "searchWithIntPraticaId"; + _methodName223 = "searchWithIntPraticaId"; - _methodParameterTypes222 = new String[] { + _methodParameterTypes223 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName223 = "allegaFileAnnullamento"; + _methodName224 = "allegaFileAnnullamento"; - _methodParameterTypes223 = new String[] { + _methodParameterTypes224 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName224 = "generateFileAnnullamento"; + _methodName225 = "generateFileAnnullamento"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes225 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName225 = "deleteFileAnnullamento"; + _methodName226 = "deleteFileAnnullamento"; - _methodParameterTypes225 = new String[] { "long" }; + _methodParameterTypes226 = new String[] { "long" }; - _methodName226 = "completeAnnullamento"; + _methodName227 = "completeAnnullamento"; - _methodParameterTypes226 = new String[] { "long" }; + _methodParameterTypes227 = new String[] { "long" }; - _methodName227 = "cambiaIstruttore"; + _methodName228 = "cambiaIstruttore"; - _methodParameterTypes227 = new String[] { "long", "long", "long" }; + _methodParameterTypes228 = new String[] { "long", "long", "long" }; - _methodName228 = "countCaricoLavoroCF"; + _methodName229 = "countCaricoLavoroCF"; - _methodParameterTypes228 = new String[] { + _methodParameterTypes229 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName229 = "countCaricoLavoroIstruttore"; + _methodName230 = "countCaricoLavoroIstruttore"; - _methodParameterTypes229 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes230 = new String[] { "long", "java.lang.String" }; - _methodName230 = "generateReportPratica"; + _methodName231 = "generateReportPratica"; - _methodParameterTypes230 = new String[] { + _methodParameterTypes231 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName231 = "updateModifiedDate"; + _methodName232 = "updateModifiedDate"; - _methodParameterTypes231 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes232 = new String[] { "long", "java.util.Date" }; - _methodName232 = "reIndexFascicolo"; + _methodName233 = "reIndexFascicolo"; - _methodParameterTypes232 = new String[] { + _methodParameterTypes233 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName233 = "reIndexFasciolo"; - - _methodParameterTypes233 = new String[] { "java.lang.String", "long" }; - _methodName234 = "reIndexFasciolo"; - _methodParameterTypes234 = new String[] { "long", "long" }; + _methodParameterTypes234 = new String[] { "java.lang.String", "long" }; - _methodName235 = "findByNumeroProgetto"; + _methodName235 = "reIndexFasciolo"; - _methodParameterTypes235 = new String[] { "java.lang.String" }; + _methodParameterTypes235 = new String[] { "long", "long" }; - _methodName236 = "findByTerritorioId"; + _methodName236 = "findByNumeroProgetto"; - _methodParameterTypes236 = new String[] { "long" }; + _methodParameterTypes236 = new String[] { "java.lang.String" }; - _methodName237 = "getOrganizationByIntPraticaId"; + _methodName237 = "findByTerritorioId"; _methodParameterTypes237 = new String[] { "long" }; - _methodName238 = "hasRichiestaIntegrazioneAttiva"; + _methodName238 = "getOrganizationByIntPraticaId"; _methodParameterTypes238 = new String[] { "long" }; - _methodName239 = "invioMailNotifica"; + _methodName239 = "hasRichiestaIntegrazioneAttiva"; + + _methodParameterTypes239 = new String[] { "long" }; + + _methodName240 = "invioMailNotifica"; - _methodParameterTypes239 = new String[] { + _methodParameterTypes240 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName240 = "searchAltriProgetti"; + _methodName241 = "searchAltriProgetti"; - _methodParameterTypes240 = new String[] { + _methodParameterTypes241 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName241 = "searchArchivioProgetti"; + _methodName242 = "searchArchivioProgetti"; - _methodParameterTypes241 = new String[] { + _methodParameterTypes242 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName242 = "searchMieiProgetti"; + _methodName243 = "searchMieiProgetti"; - _methodParameterTypes242 = new String[] { + _methodParameterTypes243 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -754,96 +758,102 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName212.equals(name) && Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + return IntPraticaLocalServiceUtil.fetchByIntPraticaId_SueSuapInstanceId(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); + } + + if (_methodName213.equals(name) && + Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName213.equals(name) && - Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName216.equals(name) && + Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName222.equals(name) && + Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return IntPraticaLocalServiceUtil.allegaFileAnnullamento(((Long)arguments[0]).longValue(), (byte[])arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (com.liferay.portal.service.ServiceContext)arguments[4]); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -851,41 +861,33 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { - return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], (java.lang.Long[])arguments[2]); - } - if (_methodName229.equals(name) && Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { - return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1]); + return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1], (java.lang.Long[])arguments[2]); } if (_methodName230.equals(name) && Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { - return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Long)arguments[1]).longValue()); + return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } if (_methodName231.equals(name) && Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { - return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), - (java.util.Date)arguments[1]); + return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], + ((Long)arguments[1]).longValue()); } if (_methodName232.equals(name) && Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Long)arguments[1]).longValue()); - - return null; + return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), + (java.util.Date)arguments[1]); } if (_methodName233.equals(name) && Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], + IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; @@ -893,7 +895,7 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName234.equals(name) && Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), + IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; @@ -901,26 +903,34 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName235.equals(name) && Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); + IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue()); + + return null; } if (_methodName236.equals(name) && Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); + return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } if (_methodName237.equals(name) && Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { - return IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(((Long)arguments[0]).longValue()); + return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } if (_methodName238.equals(name) && Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { - return IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(((Long)arguments[0]).longValue()); + return IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(((Long)arguments[0]).longValue()); } if (_methodName239.equals(name) && Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + return IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(((Long)arguments[0]).longValue()); + } + + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { IntPraticaLocalServiceUtil.invioMailNotifica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -935,24 +945,24 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return IntPraticaLocalServiceUtil.searchAltriProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { + if (_methodName242.equals(name) && + Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { return IntPraticaLocalServiceUtil.searchArchivioProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName242.equals(name) && - Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { + if (_methodName243.equals(name) && + Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { return IntPraticaLocalServiceUtil.searchMieiProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), @@ -1072,12 +1082,12 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes212; private String _methodName213; private String[] _methodParameterTypes213; - private String _methodName215; - private String[] _methodParameterTypes215; + private String _methodName214; + private String[] _methodParameterTypes214; private String _methodName216; private String[] _methodParameterTypes216; - private String _methodName218; - private String[] _methodParameterTypes218; + private String _methodName217; + private String[] _methodParameterTypes217; private String _methodName219; private String[] _methodParameterTypes219; private String _methodName220; @@ -1126,4 +1136,6 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes241; private String _methodName242; private String[] _methodParameterTypes242; + private String _methodName243; + private String[] _methodParameterTypes243; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 44390261..444564dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -634,6 +634,11 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { dynamicQuery.add(disjunctionSoggetti); return dynamicQuery; } + + @Override + public IntPratica fetchByIntPraticaId_SueSuapInstanceId(long intPraticaId, String sueSuapInstanceId) throws SystemException{ + return intPraticaPersistence.fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, sueSuapInstanceId); + } @SuppressWarnings("unchecked") @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index bdaf914f..71464772 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -4494,6 +4494,284 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_1 = "intPratica.statoPratica IS NULL"; private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_2 = "intPratica.statoPratica = ?"; private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_3 = "(intPratica.statoPratica IS NULL OR intPratica.statoPratica = '')"; + public static final FinderPath FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID = + new FinderPath(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, + IntPraticaModelImpl.FINDER_CACHE_ENABLED, IntPraticaImpl.class, + FINDER_CLASS_NAME_ENTITY, "fetchByIntPraticaId_SueSuapInstanceId", + new String[] { Long.class.getName(), String.class.getName() }, + IntPraticaModelImpl.INTPRATICAID_COLUMN_BITMASK | + IntPraticaModelImpl.SUESUAPINSTANCEID_COLUMN_BITMASK); + public static final FinderPath FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID = + new FinderPath(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, + IntPraticaModelImpl.FINDER_CACHE_ENABLED, Long.class, + FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, + "countByIntPraticaId_SueSuapInstanceId", + new String[] { Long.class.getName(), String.class.getName() }); + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchIntPraticaException} if it could not be found. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica findByIntPraticaId_SueSuapInstanceId(long intPraticaId, + String sueSuapInstanceId) + throws NoSuchIntPraticaException, SystemException { + IntPratica intPratica = fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + + if (intPratica == null) { + StringBundler msg = new StringBundler(6); + + msg.append(_NO_SUCH_ENTITY_WITH_KEY); + + msg.append("intPraticaId="); + msg.append(intPraticaId); + + msg.append(", sueSuapInstanceId="); + msg.append(sueSuapInstanceId); + + msg.append(StringPool.CLOSE_CURLY_BRACE); + + if (_log.isWarnEnabled()) { + _log.warn(msg.toString()); + } + + throw new NoSuchIntPraticaException(msg.toString()); + } + + return intPratica; + } + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found. Uses the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica fetchByIntPraticaId_SueSuapInstanceId(long intPraticaId, + String sueSuapInstanceId) throws SystemException { + return fetchByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId, true); + } + + /** + * Returns the int pratica where intPraticaId = ? and sueSuapInstanceId = ? or returns null if it could not be found, optionally using the finder cache. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @param retrieveFromCache whether to use the finder cache + * @return the matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica fetchByIntPraticaId_SueSuapInstanceId(long intPraticaId, + String sueSuapInstanceId, boolean retrieveFromCache) + throws SystemException { + Object[] finderArgs = new Object[] { intPraticaId, sueSuapInstanceId }; + + Object result = null; + + if (retrieveFromCache) { + result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + finderArgs, this); + } + + if (result instanceof IntPratica) { + IntPratica intPratica = (IntPratica)result; + + if ((intPraticaId != intPratica.getIntPraticaId()) || + !Validator.equals(sueSuapInstanceId, + intPratica.getSueSuapInstanceId())) { + result = null; + } + } + + if (result == null) { + StringBundler query = new StringBundler(4); + + query.append(_SQL_SELECT_INTPRATICA_WHERE); + + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_INTPRATICAID_2); + + boolean bindSueSuapInstanceId = false; + + if (sueSuapInstanceId == null) { + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_1); + } + else if (sueSuapInstanceId.equals(StringPool.BLANK)) { + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_3); + } + else { + bindSueSuapInstanceId = true; + + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_2); + } + + String sql = query.toString(); + + Session session = null; + + try { + session = openSession(); + + Query q = session.createQuery(sql); + + QueryPos qPos = QueryPos.getInstance(q); + + qPos.add(intPraticaId); + + if (bindSueSuapInstanceId) { + qPos.add(sueSuapInstanceId); + } + + List list = q.list(); + + if (list.isEmpty()) { + FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + finderArgs, list); + } + else { + IntPratica intPratica = list.get(0); + + result = intPratica; + + cacheResult(intPratica); + + if ((intPratica.getIntPraticaId() != intPraticaId) || + (intPratica.getSueSuapInstanceId() == null) || + !intPratica.getSueSuapInstanceId() + .equals(sueSuapInstanceId)) { + FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + finderArgs, intPratica); + } + } + } + catch (Exception e) { + FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + finderArgs); + + throw processException(e); + } + finally { + closeSession(session); + } + } + + if (result instanceof List) { + return null; + } + else { + return (IntPratica)result; + } + } + + /** + * Removes the int pratica where intPraticaId = ? and sueSuapInstanceId = ? from the database. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the int pratica that was removed + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica removeByIntPraticaId_SueSuapInstanceId( + long intPraticaId, String sueSuapInstanceId) + throws NoSuchIntPraticaException, SystemException { + IntPratica intPratica = findByIntPraticaId_SueSuapInstanceId(intPraticaId, + sueSuapInstanceId); + + return remove(intPratica); + } + + /** + * Returns the number of int praticas where intPraticaId = ? and sueSuapInstanceId = ?. + * + * @param intPraticaId the int pratica ID + * @param sueSuapInstanceId the sue suap instance ID + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + @Override + public int countByIntPraticaId_SueSuapInstanceId(long intPraticaId, + String sueSuapInstanceId) throws SystemException { + FinderPath finderPath = FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID; + + Object[] finderArgs = new Object[] { intPraticaId, sueSuapInstanceId }; + + Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, + this); + + if (count == null) { + StringBundler query = new StringBundler(3); + + query.append(_SQL_COUNT_INTPRATICA_WHERE); + + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_INTPRATICAID_2); + + boolean bindSueSuapInstanceId = false; + + if (sueSuapInstanceId == null) { + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_1); + } + else if (sueSuapInstanceId.equals(StringPool.BLANK)) { + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_3); + } + else { + bindSueSuapInstanceId = true; + + query.append(_FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_2); + } + + String sql = query.toString(); + + Session session = null; + + try { + session = openSession(); + + Query q = session.createQuery(sql); + + QueryPos qPos = QueryPos.getInstance(q); + + qPos.add(intPraticaId); + + if (bindSueSuapInstanceId) { + qPos.add(sueSuapInstanceId); + } + + count = (Long)q.uniqueResult(); + + FinderCacheUtil.putResult(finderPath, finderArgs, count); + } + catch (Exception e) { + FinderCacheUtil.removeResult(finderPath, finderArgs); + + throw processException(e); + } + finally { + closeSession(session); + } + } + + return count.intValue(); + } + + private static final String _FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_INTPRATICAID_2 = + "intPratica.intPraticaId = ? AND "; + private static final String _FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_1 = + "intPratica.sueSuapInstanceId IS NULL"; + private static final String _FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_2 = + "intPratica.sueSuapInstanceId = ?"; + private static final String _FINDER_COLUMN_INTPRATICAID_SUESUAPINSTANCEID_SUESUAPINSTANCEID_3 = + "(intPratica.sueSuapInstanceId IS NULL OR intPratica.sueSuapInstanceId = '')"; public IntPraticaPersistenceImpl() { setModelClass(IntPratica.class); @@ -4513,6 +4791,11 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl new Object[] { intPratica.getUuid(), intPratica.getGroupId() }, intPratica); + FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + new Object[] { + intPratica.getIntPraticaId(), intPratica.getSueSuapInstanceId() + }, intPratica); + intPratica.resetOriginalValues(); } @@ -4596,6 +4879,16 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, intPratica); + + args = new Object[] { + intPratica.getIntPraticaId(), + intPratica.getSueSuapInstanceId() + }; + + FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID, + args, Long.valueOf(1)); + FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + args, intPratica); } else { IntPraticaModelImpl intPraticaModelImpl = (IntPraticaModelImpl)intPratica; @@ -4611,6 +4904,19 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, intPratica); } + + if ((intPraticaModelImpl.getColumnBitmask() & + FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID.getColumnBitmask()) != 0) { + Object[] args = new Object[] { + intPratica.getIntPraticaId(), + intPratica.getSueSuapInstanceId() + }; + + FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID, + args, Long.valueOf(1)); + FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + args, intPratica); + } } } @@ -4634,6 +4940,28 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_UUID_G, args); FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_UUID_G, args); } + + args = new Object[] { + intPratica.getIntPraticaId(), intPratica.getSueSuapInstanceId() + }; + + FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID, + args); + FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + args); + + if ((intPraticaModelImpl.getColumnBitmask() & + FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID.getColumnBitmask()) != 0) { + args = new Object[] { + intPraticaModelImpl.getOriginalIntPraticaId(), + intPraticaModelImpl.getOriginalSueSuapInstanceId() + }; + + FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_INTPRATICAID_SUESUAPINSTANCEID, + args); + FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_INTPRATICAID_SUESUAPINSTANCEID, + args); + } } /** @@ -4981,6 +5309,9 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl intPraticaImpl.setCollaudoTotale(intPratica.isCollaudoTotale()); intPraticaImpl.setControlloObbligatorio(intPratica.isControlloObbligatorio()); intPraticaImpl.setInLavorazioneSue(intPratica.isInLavorazioneSue()); + intPraticaImpl.setSueSuapInstanceId(intPratica.getSueSuapInstanceId()); + intPraticaImpl.setSueSuapClientId(intPratica.getSueSuapClientId()); + intPraticaImpl.setSueSuapIpaCode(intPratica.getSueSuapIpaCode()); return intPraticaImpl; } 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 ef14f6b6..cc75189f 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=3651 - build.date=1683893966071 + build.number=3657 + build.date=1686735197893 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-collections.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-collections.jar new file mode 100644 index 00000000..fa5df82a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-collections.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-lang.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-lang.jar new file mode 100644 index 00000000..98467d3a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-lang.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-logging.jar new file mode 100644 index 00000000..8758a96b Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/commons-logging.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-api.jar new file mode 100644 index 00000000..80a5737f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-api.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-impl.jar new file mode 100644 index 00000000..e5a9342f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/jstl-impl.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/log4j.jar new file mode 100644 index 00000000..068867eb Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/log4j.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-bridges.jar new file mode 100644 index 00000000..7d7435fe Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-bridges.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-taglib.jar new file mode 100644 index 00000000..6d182ade Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity-tools.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity-tools.jar new file mode 100644 index 00000000..2ff76723 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity-tools.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity.jar b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity.jar new file mode 100644 index 00000000..e7151c5c Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/lib/velocity.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/tld/c.tld new file mode 100644 index 00000000..98efa6a6 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/tld/c.tld @@ -0,0 +1,572 @@ + + + + + JSTL 1.2 core library + JSTL core + 1.2 + c + http://java.sun.com/jsp/jstl/core + + + + Provides core validation features for JSTL tags. + + + org.apache.taglibs.standard.tlv.JstlCoreTLV + + + + + + Catches any Throwable that occurs in its body and optionally + exposes it. + + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + + +Name of the exported scoped variable for the +exception thrown from a nested action. The type of the +scoped variable is the type of the exception thrown. + + var + false + false + + + + + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + + choose + com.liferay.taglib.core.ChooseTag + JSP + + + + + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition + + if + com.liferay.taglib.core.IfTag + JSP + + +The test condition that determines whether or +not the body content should be processed. + + test + true + true + boolean + + + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + + var + false + false + + + +Scope for var. + + scope + false + false + + + + + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + + import + org.apache.taglibs.standard.tag.rt.core.ImportTag + org.apache.taglibs.standard.tei.ImportTEI + JSP + + +The URL of the resource to import. + + url + true + true + + + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is String. + + var + false + false + + + +Scope for var. + + scope + false + false + + + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is Reader. + + varReader + false + false + + + +Name of the context when accessing a relative +URL resource that belongs to a foreign +context. + + context + false + true + + + +Character encoding of the content at the input +resource. + + charEncoding + false + true + + + + + + The basic iteration tag, accepting many different + collection types and supporting subsetting and other + functionality + + forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + + +Collection of items to iterate over. + + items + false + true + java.lang.Object + + java.lang.Object + + + + +If items specified: +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. +If items not specified: +Iteration begins with index set at the value +specified. + + begin + false + true + int + + + +If items specified: +Iteration ends at the item located at the +specified index (inclusive). +If items not specified: +Iteration ends when index reaches the value +specified. + + end + false + true + int + + + +Iteration will only process every step items of +the collection, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. Its type depends +on the object of the underlying collection. + + var + false + false + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested +visibility. + + varStatus + false + false + + + + + + Iterates over tokens, separated by the supplied delimeters + + forTokens + org.apache.taglibs.standard.tag.rt.core.ForTokensTag + JSP + + +String of tokens to iterate over. + + items + true + true + java.lang.String + + java.lang.String + + + + +The set of delimiters (the characters that +separate the tokens in the string). + + delims + true + true + java.lang.String + + + +Iteration begins at the token located at the +specified index. First token has index 0. + + begin + false + true + int + + + +Iteration ends at the token located at the +specified index (inclusive). + + end + false + true + int + + + +Iteration will only process every step tokens +of the string, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. + + var + false + false + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of +type +javax.servlet.jsp.jstl.core.LoopTag +Status. This scoped variable has nested +visibility. + + varStatus + false + false + + + + + + Like <%= ... >, but for expressions. + + out + org.apache.taglibs.standard.tag.rt.core.OutTag + JSP + + +Expression to be evaluated. + + value + true + true + + + +Default value if the resulting value is null. + + default + false + true + + + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default value is +true. + + escapeXml + false + true + + + + + + + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + + otherwise + com.liferay.taglib.core.OtherwiseTag + JSP + + + + + Adds a parameter to a containing 'import' tag's URL. + + param + org.apache.taglibs.standard.tag.rt.core.ParamTag + JSP + + +Name of the query string parameter. + + name + true + true + + + +Value of the parameter. + + value + false + true + + + + + + Redirects to a new URL. + + redirect + org.apache.taglibs.standard.tag.rt.core.RedirectTag + JSP + + +The URL of the resource to redirect to. + + url + false + true + + + +Name of the context when redirecting to a relative URL +resource that belongs to a foreign context. + + context + false + true + + + + + + Removes a scoped variable (from a particular scope, if specified). + + remove + org.apache.taglibs.standard.tag.common.core.RemoveTag + empty + + +Name of the scoped variable to be removed. + + var + true + false + + + +Scope for var. + + scope + false + false + + + + + + Sets the result of an expression evaluation in a 'scope' + + set + org.apache.taglibs.standard.tag.rt.core.SetTag + JSP + + +Name of the exported scoped variable to hold the value +specified in the action. The type of the scoped variable is +whatever type the value expression evaluates to. + + var + false + false + + + +Expression to be evaluated. + + value + false + true + + java.lang.Object + + + + +Target object whose property will be set. Must evaluate to +a JavaBeans object with setter property property, or to a +java.util.Map object. + + target + false + true + + + +Name of the property to be set in the target object. + + property + false + true + + + +Scope for var. + + scope + false + false + + + + + + Creates a URL with optional query parameters. + + url + org.apache.taglibs.standard.tag.rt.core.UrlTag + JSP + + +Name of the exported scoped variable for the +processed url. The type of the scoped variable is +String. + + var + false + false + + + +Scope for var. + + scope + false + false + + + +URL to be processed. + + value + false + true + + + +Name of the context when specifying a relative URL +resource that belongs to a foreign context. + + context + false + true + + + + + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + + when + com.liferay.taglib.core.WhenTag + JSP + + +The test condition that determines whether or not the +body content should be processed. + + test + true + true + boolean + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/.classpath index 40cc6e39..5e9ff87f 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/.classpath @@ -1,9 +1,9 @@ - + - + @@ -15,6 +15,10 @@ - + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index b003b616..c97d497c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 7eac521e..762b183f 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/liferay-portlet.xml index 4dc10325..d3fa6441 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -10,7 +10,7 @@ portos.nextmind.quarkus.bridge.scheduler.QuarkusBridgeScheduler - 0 */5 * ? * * + 0 */1 * ? * * diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portal.properties b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portal.properties new file mode 100644 index 00000000..236bfd94 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portal.properties @@ -0,0 +1 @@ +application.startup.events=portos.nextmind.liferay.bridge.action.StartUpAction \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/action/StartUpAction.java b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/action/StartUpAction.java new file mode 100644 index 00000000..b8b75c91 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/action/StartUpAction.java @@ -0,0 +1,102 @@ +package portos.nextmind.liferay.bridge.action; + +import com.liferay.portal.kernel.events.ActionException; +import com.liferay.portal.kernel.events.SimpleAction; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.GetterUtil; +import com.liferay.portal.kernel.util.UnicodeProperties; +import com.liferay.portal.model.Company; +import com.liferay.portal.model.ResourceConstants; +import com.liferay.portal.model.Role; +import com.liferay.portal.model.RoleConstants; +import com.liferay.portal.security.permission.ActionKeys; +import com.liferay.portal.service.ResourcePermissionLocalServiceUtil; +import com.liferay.portal.service.RoleLocalServiceUtil; +import com.liferay.portal.util.PortalUtil; +import com.liferay.portlet.expando.model.ExpandoColumn; +import com.liferay.portlet.expando.model.ExpandoColumnConstants; +import com.liferay.portlet.expando.model.ExpandoTable; +import com.liferay.portlet.expando.model.ExpandoTableConstants; +import com.liferay.portlet.expando.service.ExpandoColumnLocalServiceUtil; +import com.liferay.portlet.expando.service.ExpandoTableLocalServiceUtil; + +import portos.nextmind.quarkus.bridge.api.QuarkusBridgeConstants; + +public class StartUpAction extends SimpleAction { + + private final static Log _log = LogFactoryUtil.getLog(StartUpAction.class); + + @Override + public void run(String[] companyIds) throws ActionException { + + for (String id : companyIds) { + try { + long companyId = GetterUtil.getLong(id); + String[] defaultActions = { ActionKeys.VIEW, ActionKeys.UPDATE }; + String[] guestActions = { ActionKeys.VIEW }; + // Organization custom fields + _log.info("Adding QuarkusBridgeConstants.QUARKUS_BASE_URL Company custom field"); + addExpandoColumnIfNotExists(companyId, Company.class.getName(), QuarkusBridgeConstants.QUARKUS_BASE_URL, + ExpandoColumnConstants.STRING, true, false, defaultActions, guestActions); + } catch (Exception e) { + _log.error("Errore nella procedura automatizzata di configurazione", e); + } + } + } + + private ExpandoColumn addExpandoColumnIfNotExists(long companyId, String className, String name, int type, + boolean indexed, boolean hidden, String[] defaultActions, String[] guestActions) throws SystemException { + + long classNameId = PortalUtil.getClassNameId(className); + ExpandoTable expandoTable = null; + try { + expandoTable = ExpandoTableLocalServiceUtil.getTable(companyId, classNameId, + ExpandoTableConstants.DEFAULT_TABLE_NAME); + } catch (PortalException e) { + try { + expandoTable = ExpandoTableLocalServiceUtil.addTable(companyId, classNameId, + ExpandoTableConstants.DEFAULT_TABLE_NAME); + } catch (PortalException e1) { + } + } + ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil.getColumn(expandoTable.getTableId(), name); + if (expandoColumn == null) { + try { + expandoColumn = ExpandoColumnLocalServiceUtil.addColumn(expandoTable.getTableId(), name, type); + } catch (PortalException e) { + } + } + try { + if (indexed) { + UnicodeProperties typeSettingsProperties = expandoColumn.getTypeSettingsProperties(); + typeSettingsProperties.put(ExpandoColumnConstants.INDEX_TYPE, + String.valueOf(ExpandoColumnConstants.INDEX_TYPE_TEXT)); + expandoColumn.setTypeSettingsProperties(typeSettingsProperties); + expandoColumn = ExpandoColumnLocalServiceUtil.updateExpandoColumn(expandoColumn); + } + if (hidden) { + UnicodeProperties typeSettingsProperties = expandoColumn.getTypeSettingsProperties(); + typeSettingsProperties.put(ExpandoColumnConstants.PROPERTY_HIDDEN, String.valueOf(1)); + expandoColumn.setTypeSettingsProperties(typeSettingsProperties); + expandoColumn = ExpandoColumnLocalServiceUtil.updateExpandoColumn(expandoColumn); + } + Role roleGuest = RoleLocalServiceUtil.getRole(companyId, RoleConstants.GUEST); + Role rolePowerUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.POWER_USER); + Role roleUser = RoleLocalServiceUtil.getRole(companyId, RoleConstants.USER); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + roleGuest.getRoleId(), guestActions); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + rolePowerUser.getRoleId(), defaultActions); + ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, ExpandoColumn.class.getName(), + ResourceConstants.SCOPE_INDIVIDUAL, String.valueOf(expandoColumn.getColumnId()), + roleUser.getRoleId(), defaultActions); + } catch (PortalException e) { + } + return expandoColumn; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/persistence/PraticaValidator.java b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/persistence/PraticaValidator.java index 88110612..79e83179 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/persistence/PraticaValidator.java +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/liferay/bridge/persistence/PraticaValidator.java @@ -69,11 +69,11 @@ public class PraticaValidator { }; public static Comune fetchComune(long companyId, String codiceIstat) throws SystemException { - Comune comune = ComuneLocalServiceUtil.fetchByC_CI(companyId, codiceIstat); + Comune comune = ComuneLocalServiceUtil.fetchByC_CB(companyId, codiceIstat); if (comune == null) { _log.warn("#[!]# Nessun Comune trovato con la coppia companyId "+companyId+ " e codiceIstat "+codiceIstat); - _log.warn("#[!]# La richiesta sarà ignorata, verificare sul middleware Quarkus"); + _log.warn("#[!]# La richiesta sar� ignorata, verificare sul middleware Quarkus"); return null; } return comune; @@ -83,13 +83,13 @@ public class PraticaValidator { List territori = TerritorioLocalServiceUtil.findByComuneId(comuneId, 0, 1); if (territori.isEmpty()) { _log.warn("#[!]# Nessun Territorio trovato per il comuneId "+comuneId); - _log.warn("#[!]# La richiesta sarà ignorata, verificare sul middleware Quarkus"); + _log.warn("#[!]# La richiesta sar� ignorata, verificare sul middleware Quarkus"); return null; } return territori.get(0); } - public static User fetchUser(long companyId, long groupId, String codiceFiscale, String email, String nome, String cognome, long comuneId) throws SystemException, PortalException{ + public static User fetchUser(long companyId, long groupId, String codiceFiscale, String email, String nome, String cognome) throws SystemException, PortalException{ User user = UserLocalServiceUtil.fetchUserByScreenName(companyId, codiceFiscale.trim().toLowerCase()); if(Validator.isNotNull(user)) { diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeConstants.java b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeConstants.java index c0898cfd..29b1b70c 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeConstants.java +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeConstants.java @@ -21,6 +21,12 @@ public class QuarkusBridgeConstants { public final static String contenuto = "content"; public final static String datiContenuto = "data"; + public final static String successCode = "0"; + public final static String errorCode = "1"; + public final static String unexpectedCode = "2"; + + public static final String QUARKUS_BASE_URL = "base_url_quarkus"; + public class DataTypes { public final static String ACTORS = "ACTORS"; public final static String MAIN_DETAILS = "MAIN_DETAILS"; diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeMessageFactoryUtil.java b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeMessageFactoryUtil.java index fe6e7dcd..42010eea 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeMessageFactoryUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/api/QuarkusBridgeMessageFactoryUtil.java @@ -1,5 +1,7 @@ package portos.nextmind.quarkus.bridge.api; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONArray; import com.liferay.portal.kernel.json.JSONException; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -9,6 +11,8 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.Company; +import com.liferay.portal.service.CompanyLocalServiceUtil; import java.io.BufferedReader; import java.io.IOException; @@ -48,12 +52,24 @@ public class QuarkusBridgeMessageFactoryUtil { READ, WRITE, DELETE } - public static void createCallback(String context, Long id, JSONObject content){ + public static void callback(String scheduledActionId, JSONObject content, long companyId, boolean isError) + throws PortalException, SystemException{ HttpURLConnection HttpConnection = null; + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String baseUrl = (String) company.getExpandoBridge() + .getAttribute(QuarkusBridgeConstants.QUARKUS_BASE_URL, false); try{ - URL url = new URL("http://localhost:50000/portos/mw/new/" - .concat(context).concat(StringPool.FORWARD_SLASH) - .concat(String.valueOf(id))); + String urlString = baseUrl + "outcome/" + .concat(scheduledActionId); + if(isError){ + + urlString = _addQueryParam(true, urlString, "statusCode", content.getString("code")); + } + URL url = new URL(urlString); + + if(_log.isDebugEnabled()){ + _log.debug("### ACTION: "+scheduledActionId+" # Quarkus Bridge [Sending POST to URL " + url.toString() + "]"); + } HttpConnection = (HttpURLConnection) url.openConnection(); @@ -80,10 +96,10 @@ public class QuarkusBridgeMessageFactoryUtil { int responseCode = HttpConnection.getResponseCode(); switch(responseCode){ case 200: - _log.debug("### Quarkus Bridge [Read :: 200 OK]"); + _log.debug("### ACTION: "+scheduledActionId+" # Quarkus Bridge [Read :: 200 OK]"); break; case 500: - _log.debug("### Quarkus Bridge [Read :: 500 Quarkus Server Error]"); + _log.debug("### ACTION: "+scheduledActionId+" # Quarkus Bridge [Read :: 500 Quarkus Server Error]"); break; } }catch(RuntimeException e){ @@ -100,11 +116,16 @@ public class QuarkusBridgeMessageFactoryUtil { } } - public static JSONObject readNewData(String context){ + public static JSONObject readNewData(String context, long companyId) throws PortalException, SystemException{ JSONObject responseBody = JSONFactoryUtil.createJSONObject(); HttpURLConnection HttpConnection = null; + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String baseUrl = (String) company.getExpandoBridge() + .getAttribute(QuarkusBridgeConstants.QUARKUS_BASE_URL, false); try{ - URL url = new URL("http://localhost:50000/portos/mw/new/".concat(context)); + URL url = new URL(baseUrl + "new/".concat(context)); + + _log.debug("### URL called: " + url.toString()); HttpConnection = (HttpURLConnection) url.openConnection(); @@ -134,6 +155,7 @@ public class QuarkusBridgeMessageFactoryUtil { response.append(line); } reader.close(); + _log.debug("### NEW RESPONSE:" + response.toString()); //TODO Process the response if(response.charAt(0) == '{'){ JSONObject resultSet = JSONFactoryUtil.createJSONObject(response.toString()); @@ -163,11 +185,16 @@ public class QuarkusBridgeMessageFactoryUtil { return responseBody; } - public static JSONObject readData(String context, String praticaId){ + public static JSONObject readData(String context, long companyId) throws PortalException, SystemException{ JSONObject responseBody = JSONFactoryUtil.createJSONObject(); HttpURLConnection HttpConnection = null; + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String baseUrl = (String) company.getExpandoBridge() + .getAttribute(QuarkusBridgeConstants.QUARKUS_BASE_URL, false); try{ - URL url = new URL("http://localhost:50000/portos/mw/read/".concat(context).concat(praticaId)); + URL url = new URL(baseUrl + "read/".concat(context)); + + _log.debug("### URL called: " + url.toString()); HttpConnection = (HttpURLConnection) url.openConnection(); @@ -197,6 +224,7 @@ public class QuarkusBridgeMessageFactoryUtil { response.append(line); } reader.close(); + _log.debug("### READ RESPONSE:" + response.toString()); //TODO Process the response if(response.charAt(0) == '{'){ JSONObject resultSet = JSONFactoryUtil.createJSONObject(response.toString()); @@ -226,12 +254,16 @@ public class QuarkusBridgeMessageFactoryUtil { return responseBody; } - public static JSONObject writeUpdateData(String context, String praticaId){ + public static JSONObject writeUpdateData(String context, long companyId) throws PortalException, SystemException{ JSONObject responseBody = JSONFactoryUtil.createJSONObject(); HttpURLConnection HttpConnection = null; + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String baseUrl = (String) company.getExpandoBridge() + .getAttribute(QuarkusBridgeConstants.QUARKUS_BASE_URL, false); try{ - URL url = new URL("http://localhost:50000/portos/mw/update/".concat(context) - .concat(StringPool.SLASH).concat(praticaId)); + URL url = new URL(baseUrl + "update/".concat(context)); + + _log.debug("### URL called: " + url.toString()); HttpConnection = (HttpURLConnection) url.openConnection(); @@ -253,7 +285,7 @@ public class QuarkusBridgeMessageFactoryUtil { int responseCode = HttpConnection.getResponseCode(); switch(responseCode){ case 200: - _log.debug("### Quarkus Bridge [Read :: 200 OK]"); + _log.debug("### Quarkus Bridge [Update :: 200 OK]"); // Read the response BufferedReader reader = new BufferedReader(new InputStreamReader(HttpConnection.getInputStream())); String line; @@ -261,13 +293,15 @@ public class QuarkusBridgeMessageFactoryUtil { response.append(line); } reader.close(); + String responseString = response.toString(); + _log.debug("### UPDATE RESPONSE:" + responseString); //TODO Process the response if(response.charAt(0) == '{'){ - JSONObject resultSet = JSONFactoryUtil.createJSONObject(response.toString()); + JSONObject resultSet = JSONFactoryUtil.createJSONObject(responseString); responseBody = responseBody.put("result", resultSet); } if(response.charAt(0) == '['){ - JSONArray resultSet = JSONFactoryUtil.createJSONArray(response.toString()); + JSONArray resultSet = JSONFactoryUtil.createJSONArray(responseString); responseBody = responseBody.put("result", resultSet); } break; @@ -292,107 +326,17 @@ public class QuarkusBridgeMessageFactoryUtil { return responseBody; } - public static void updateCallback(String context, Long id, JSONObject content){ - HttpURLConnection HttpConnection = null; - try{ - URL url = new URL("http://localhost:50000/portos/mw/update/" - .concat(context).concat(StringPool.FORWARD_SLASH) - .concat(String.valueOf(id))); - - HttpConnection = (HttpURLConnection) url.openConnection(); - - // Set MediaType Accepted in Accept Header - HttpConnection.addRequestProperty("Content-Type", "application/json"); - - // Set request method - HttpConnection.setRequestMethod("POST"); - - // Set connection timeout - HttpConnection.setConnectTimeout(5000); - - // Enable output stream to send the payload - HttpConnection.setDoOutput(true); - - // Send the payload over the output stream - String payload = content.toString(); - - OutputStream outputStream = HttpConnection.getOutputStream(); - outputStream.write(payload.getBytes("UTF-8")); - outputStream.close(); - - // Get the response code - int responseCode = HttpConnection.getResponseCode(); - switch(responseCode){ - case 200: - _log.debug("### Quarkus Bridge [Read :: 200 OK]"); - break; - case 500: - _log.debug("### Quarkus Bridge [Read :: 500 Quarkus Server Error]"); - break; - } - }catch(RuntimeException e){ - _log.error(e,e); - } catch (MalformedURLException e) { - _log.error(e,e); - } catch (IOException e) { - _log.error(e,e); - } finally { - // Close the connection - if(Validator.isNotNull(HttpConnection)){ - HttpConnection.disconnect(); - } + private static String _addQueryParam(boolean isFirst, String url, String paramName, String paramValue){ + if(isFirst){ + url = url.concat(StringPool.QUESTION); + } else { + url = url.concat(StringPool.AMPERSAND); } + url = url.concat(paramName) + .concat(StringPool.EQUAL) + .concat(paramValue); + + return url; } - public static void readCallback(String context, Long id, JSONObject content){ - HttpURLConnection HttpConnection = null; - try{ - URL url = new URL("http://localhost:50000/portos/mw/read/" - .concat(context).concat(StringPool.FORWARD_SLASH) - .concat(String.valueOf(id))); - - HttpConnection = (HttpURLConnection) url.openConnection(); - - // Set MediaType Accepted in Accept Header - HttpConnection.addRequestProperty("Content-Type", "application/json"); - - // Set request method - HttpConnection.setRequestMethod("POST"); - - // Set connection timeout - HttpConnection.setConnectTimeout(5000); - - // Enable output stream to send the payload - HttpConnection.setDoOutput(true); - - // Send the payload over the output stream - String payload = content.toString(); - - OutputStream outputStream = HttpConnection.getOutputStream(); - outputStream.write(payload.getBytes("UTF-8")); - outputStream.close(); - - // Get the response code - int responseCode = HttpConnection.getResponseCode(); - switch(responseCode){ - case 200: - _log.debug("### Quarkus Bridge [Read :: 200 OK]"); - break; - case 500: - _log.debug("### Quarkus Bridge [Read :: 500 Quarkus Server Error]"); - break; - } - }catch(RuntimeException e){ - _log.error(e,e); - } catch (MalformedURLException e) { - _log.error(e,e); - } catch (IOException e) { - _log.error(e,e); - } finally { - // Close the connection - if(Validator.isNotNull(HttpConnection)){ - HttpConnection.disconnect(); - } - } - } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/scheduler/QuarkusBridgeScheduler.java b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/scheduler/QuarkusBridgeScheduler.java index 69f73c30..8c0b5426 100644 --- a/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/scheduler/QuarkusBridgeScheduler.java +++ b/liferay-plugins-sdk-6.2/portlets/quarkus-bridge-portlet/docroot/WEB-INF/src/portos/nextmind/quarkus/bridge/scheduler/QuarkusBridgeScheduler.java @@ -1,6 +1,7 @@ package portos.nextmind.quarkus.bridge.scheduler; import com.liferay.portal.kernel.dao.orm.DynamicQuery; +import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -18,8 +19,7 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.expando.model.ExpandoBridge; -import com.liferay.portlet.expando.model.ExpandoColumnConstants; +import com.liferay.portal.service.UserLocalServiceUtil; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.DettPratica; @@ -30,6 +30,8 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import javax.xml.bind.DatatypeConverter; @@ -44,117 +46,126 @@ import portos.nextmind.quarkus.bridge.api.QuarkusBridgeConstants; import portos.nextmind.quarkus.bridge.api.QuarkusBridgeMessageFactoryUtil; public class QuarkusBridgeScheduler implements MessageListener { - + Log _log = LogFactoryUtil.getLog(QuarkusBridgeScheduler.class); + private static final Lock lock = new ReentrantLock(); + @Override public void receive(Message message) throws MessageListenerException { - _log.info("### Quarkus Bridge Scheduler starting . . ."); - ArrayList companies = null; - try { - companies = new ArrayList<>(CompanyLocalServiceUtil.getCompanies()); - } catch (SystemException e) { - _log.error(e,e); - } - if(Validator.isNull(companies)){ - _log.error("### Quarkus Bridge was unable to create batch beacuse it was unable to find any companyId."); - return; - } - for(Company company : companies){ - JSONArray createPayload = prepareCreateBatch(company.getCompanyId()); - for(int i = 0; i < createPayload.length() ; i++){ - signalWritten(createPayload.getJSONObject(i)); - } - JSONArray updatePayload = prepareUpdateBatch(company.getCompanyId()); - for(int i = 0; i < updatePayload.length() ; i++){ - JSONArray jsonResultByIntPraticaId = updatePayload.getJSONArray(i); - signalUpdated(jsonResultByIntPraticaId); - } - JSONArray readPayload = prepareReadBatch(company.getCompanyId()); - for(int i = 0; i < updatePayload.length() ; i++){ - JSONArray jsonResultByIntPraticaId = readPayload.getJSONArray(i); - signalRead(jsonResultByIntPraticaId); + + if (lock.tryLock()) { + try{ + _log.info("### Quarkus Bridge Scheduler starting . . ."); + ArrayList companies = null; + companies = new ArrayList<>(CompanyLocalServiceUtil.getCompanies()); + if(Validator.isNull(companies)){ + // _log.error("### Quarkus Bridge was unable to create batch beacuse it was unable to find any companyId."); + _log.error("### Quarkus Bridge was unable to start its job beacuse it was unable to find any companyId."); + return; + } + for(Company company : companies){ + // JSONArray createPayload = prepareCreateBatch(company.getCompanyId()); + + // Recupera tutte le action di CREATE e le esegue una ad una + retrieveAndExecuteCreate(company.getCompanyId()); + // for(int i = 0; i < createPayload.length() ; i++){ + // signalWritten(createPayload.getJSONObject(i)); + // } + + // Recupera tutte le action di UPDATE e le esegue una ad una + retrieveAndExecuteUpdate(company.getCompanyId()); + // JSONArray updatePayload = prepareUpdateBatch(company.getCompanyId()); + // for(int i = 0; i < updatePayload.length() ; i++){ + // JSONArray jsonResultByIntPraticaId = updatePayload.getJSONArray(i); + // signalUpdated(jsonResultByIntPraticaId); + // } + + // Recupera tutte le action di READ e le esegue una ad una + retrieveAndExecuteRead(company.getCompanyId()); + // JSONArray readPayload = prepareReadBatch(company.getCompanyId()); + // for(int i = 0; i < updatePayload.length() ; i++){ + // JSONArray jsonResultByIntPraticaId = readPayload.getJSONArray(i); + // signalRead(jsonResultByIntPraticaId); + // } + } + _log.info("### Quarkus Bridge job done."); + } catch (PortalException | SystemException e){ + _log.error(e,e); + } finally { + lock.unlock(); } } - _log.info("### Quarkus Bridge Scheduler batch ready."); } - - private void signalWritten(JSONObject content){ + + private void signalOperationSuccess(String scheduledActionId, boolean isRead, JSONObject content, long companyId) throws PortalException, SystemException{ // ogni oggetto viene segnalato all'endpoint univoco per l'operazione INSTANCE_WRITE - String context = content.getString("context"); - Long scheduledActionId = content.getLong("scheduled_action_id"); - QuarkusBridgeMessageFactoryUtil.createCallback(context, scheduledActionId, content); - } - - private void signalUpdated(JSONArray content){ - for(int i = 0; i < content.length() ; i++){ - // Get each operation result 1 by 1 and signal the result to quarkus middleware - JSONObject instance = content.getJSONObject(i); - String context = instance.getString("context"); - Long scheduledActionId = instance.getLong("scheduled_action_id"); - String operation = instance.getString("operation"); - Boolean operationResult = instance.getBoolean("esito"); - String intPraticaId = instance.getString("instanceId"); - - StringBuilder sb = new StringBuilder("### Sending signal for the ") - .append(operationResult ? "success" : "failure") - .append(" of the ").append(operation) - .append(" on Instance with id ").append(intPraticaId); - - _log.debug(sb.toString()); - QuarkusBridgeMessageFactoryUtil.updateCallback(context, scheduledActionId, instance); + if(!isRead || Validator.isNull(content)){ + content = JSONFactoryUtil.createJSONObject(); + } + content.put("code", QuarkusBridgeConstants.successCode); + content.put("portalError", StringPool.BLANK); + if(_log.isDebugEnabled()){ + _log.debug("#[!]# Sending SUCCESS callback for ScheduledAction: " + scheduledActionId); } + QuarkusBridgeMessageFactoryUtil.callback(scheduledActionId, content, companyId, false); } - - private void signalRead(JSONArray content){ - //TODO: callback to quarkus middleware - for(int i = 0; i < content.length() ; i++){ - // Get each operation result 1 by 1 and signal the result to quarkus middleware - JSONObject instance = content.getJSONObject(i); - String context = instance.getString("context"); - Long scheduledActionId = instance.getLong("scheduled_action_id"); - String operation = instance.getString("operation"); - Boolean operationResult = instance.getBoolean("esito"); - String intPraticaId = instance.getString("instanceId"); - - StringBuilder sb = new StringBuilder("### Sending signal for the ") - .append(operationResult ? "success" : "failure") - .append(" of the ").append(operation) - .append(" on Instance with id ").append(intPraticaId); - - _log.debug(sb.toString()); - QuarkusBridgeMessageFactoryUtil.readCallback(context, scheduledActionId, instance); + + private void signalOperationFailure(String scheduledActionId, String message, long companyId, String code) throws PortalException, SystemException{ + // ogni oggetto viene segnalato all'endpoint univoco per l'operazione INSTANCE_WRITE + JSONObject content = JSONFactoryUtil.createJSONObject(); + content.put("code", code); + content.put("portalError", message); + if(_log.isDebugEnabled()){ + _log.debug("#[!]# Sending FAILURE callback for ScheduledAction: " + scheduledActionId + + " with error: " + message); } + QuarkusBridgeMessageFactoryUtil.callback(scheduledActionId, content, companyId, true); } - - private JSONArray prepareCreateBatch(long companyId){ - JSONArray createBatchResult = JSONFactoryUtil.createJSONArray(); + + private void retrieveAndExecuteCreate(long companyId) throws PortalException, SystemException{ + // JSONArray createBatchResult = JSONFactoryUtil.createJSONArray(); //TODO: Aggiornare quando Enrico chiede da dove recuperare i dati per la creazione // (Nome, Cognome, Email, digitalHolderTaxCode, CadastralCode) final String clientContext = "SUAP"; - JSONObject object = QuarkusBridgeMessageFactoryUtil.readNewData(clientContext); - _log.debug(object.toString()); + JSONObject object = QuarkusBridgeMessageFactoryUtil.readNewData(clientContext, companyId); + if(_log.isDebugEnabled()){ + _log.debug(object.toString()); + } JSONArray pratiche = object.getJSONArray("result"); for(int i = 0; i < pratiche.length() ; i++){ - JSONObject item = JSONFactoryUtil.createJSONObject(); - //TODO: remove debug --> - if(true) continue; - ////TODO: remove debug <-- - item = item.put("context", clientContext); + JSONObject content = JSONFactoryUtil.createJSONObject(); + content = content.put("context", clientContext); JSONObject pratica = pratiche.getJSONObject(i); - JSONObject Header = pratica.getJSONObject(QuarkusBridgeConstants.HEADER_REQUEST); JSONObject Sportello = pratica.getJSONObject(QuarkusBridgeConstants.BODY_REQUEST); + String clientId = Sportello.getString("clientId"); + String instanceId = Sportello.getString("instanceId"); + String ipaCode = Sportello.getString("ipaCode"); + content = content.put("ipaCode", ipaCode); JSONObject Action = pratica.getJSONObject(QuarkusBridgeConstants.SCHEDULED_ACTION); - item = item.put("scheduled_action_id", Action.getLong("id")); + String scheduledActionId = Action.getString("id"); String codiceIstat = Sportello.getString(QuarkusBridgeConstants.codiceIstat); try { // Cerca comune di appartenenza + Comune comune = PraticaValidator.fetchComune(companyId, codiceIstat); - if(Validator.isNull(comune)) continue; + if(Validator.isNull(comune)){ + signalOperationFailure(scheduledActionId, + "Nessun Comune trovato con codiceIstat " + codiceIstat, companyId, QuarkusBridgeConstants.errorCode); + _log.error("#[!]# ACTION: "+scheduledActionId+" # Can't retrieve Comune with codiceIstat: " + codiceIstat); + continue; + } // Cerca territorio di appartenenza long comuneId = comune.getComuneId(); Territorio territorio = PraticaValidator.fetchTerritorio(comuneId); - if(Validator.isNull(territorio)) continue; + if(Validator.isNull(territorio)) { + signalOperationFailure(scheduledActionId, + "Nessun Territorio trovato per il comuneId " + comuneId + + "con codiceIstat " + codiceIstat, companyId, QuarkusBridgeConstants.errorCode); + _log.error("#[!]# ACTION: "+scheduledActionId+" # Can't retrieve Territorio with comuneID: " + comuneId + + " and codiceIstat: " + codiceIstat); + continue; + } // Cerca utente associato alla pratica long groupId = territorio.getGroupId(); String codiceFiscale = Sportello.getString(QuarkusBridgeConstants.codiceFiscale); @@ -162,316 +173,346 @@ public class QuarkusBridgeScheduler implements MessageListener { String nome = Sportello.getString(QuarkusBridgeConstants.nome, StringPool.BLANK); String cognome = Sportello.getString(QuarkusBridgeConstants.cognome, StringPool.BLANK); if(Validator.isBlank(email) || Validator.isBlank(nome) || Validator.isBlank(cognome)){ - _log.error("#[!]# Missing one or more of the required fields - First Name, Last Name, E-Mail"); + signalOperationFailure(scheduledActionId, + "Missing one or more of the required fields - First Name, Last Name, E-Mail", + companyId, QuarkusBridgeConstants.errorCode); + _log.error("#[!]# ACTION: "+scheduledActionId+" # Missing one or more of the required fields - First Name, Last Name, E-Mail"); continue; } User user = PraticaValidator.fetchUser(companyId, groupId, - codiceFiscale, email, nome, cognome, comuneId); + codiceFiscale, email, nome, cognome); + + // FIXME: remove, this is just for testing purposes + if(Validator.isNull(user)){ + user = UserLocalServiceUtil.getUsers(QueryUtil.ALL_POS, QueryUtil.ALL_POS).get(0); + } + // Recupera la procedura della pratica - String tipoProcedura = Sportello.getString(QuarkusBridgeConstants.tipoProcedura); + String base64Payload = Sportello.getString(QuarkusBridgeConstants.contenuto); + byte[] decodedBytes = DatatypeConverter.parseBase64Binary(base64Payload); + JSONArray jsonArrayContent = JSONFactoryUtil.createJSONArray(new String(decodedBytes)); +// JSONArray jsonArrayContent = JSONFactoryUtil.createJSONArray(Sportello.getString(QuarkusBridgeConstants.contenuto)); + if(jsonArrayContent.length() != 1){ + signalOperationFailure(scheduledActionId, + "Unexpected Array size, size is: " + jsonArrayContent.length(), + companyId, QuarkusBridgeConstants.unexpectedCode); + _log.error("#[!]# ACTION: "+scheduledActionId+" # Unexpected Array size, size is: " + jsonArrayContent.length()); + continue; + } + JSONObject jsonObjectContent = jsonArrayContent.getJSONObject(0); + String tipoProcedura = jsonObjectContent.getString(QuarkusBridgeConstants.tipoProcedura); + content = content.put(QuarkusBridgeConstants.tipoProcedura, tipoProcedura); + + content = content.put("url", StringPool.BLANK); ServiceContext serviceContext = new ServiceContext(); serviceContext.setScopeGroupId(groupId); serviceContext.setCompanyId(companyId); serviceContext.setUserId(user.getUserId()); - //TODO: remove circuit breaker - if(true) continue; - - + // Aggiungi DettPratica ed IntPratica long territorioId = territorio.getTerritorioId(); - //TODO: verifica che la pratica non esista già + //TODO: verifica che la pratica non esista gi� if(!PraticaValidator.PROCEDURE.contains(tipoProcedura)){ - _log.error("#[!]# " + tipoProcedura + " is not a Valid TipoPratica"); + signalOperationFailure(scheduledActionId, + tipoProcedura + " is not a Valid TipoPratica", + companyId, QuarkusBridgeConstants.errorCode); + _log.error("#[!]# ACTION: "+scheduledActionId+" # " + tipoProcedura + " is not a Valid TipoPratica"); continue; } DettPratica dettPratica = DettPraticaLocalServiceUtil .addDettPratica(territorioId, tipoProcedura, serviceContext); - + // Add custom fields to IntPratica to fetch future updates from Kafka IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(dettPratica.getIntPraticaId()); - - ExpandoBridge customFieldsExpando = intPratica.getExpandoBridge(); - customFieldsExpando.addAttribute(QuarkusBridgeConstants.instanceId, - ExpandoColumnConstants.STRING); - customFieldsExpando.addAttribute(QuarkusBridgeConstants.correlationId, - ExpandoColumnConstants.STRING); - customFieldsExpando.addAttribute(QuarkusBridgeConstants.clientId, - ExpandoColumnConstants.STRING); - customFieldsExpando.addAttribute("HeaderSportelloId", ExpandoColumnConstants.LONG); - customFieldsExpando.addAttribute("SportelloId", ExpandoColumnConstants.LONG); - - String correlationId = Header.getString(QuarkusBridgeConstants.correlationId); - String clientId = Header.getString(QuarkusBridgeConstants.clientId); - - Long headerSportelloId = Header.getLong(QuarkusBridgeConstants.recordId); - Long sportelloId = Sportello.getLong(QuarkusBridgeConstants.recordId); - - customFieldsExpando.setAttribute(QuarkusBridgeConstants.correlationId, correlationId); - customFieldsExpando.setAttribute(QuarkusBridgeConstants.clientId, clientId); - - customFieldsExpando.setAttribute("HeaderSportelloId", headerSportelloId); - customFieldsExpando.setAttribute("SportelloId", sportelloId); - - intPratica.setExpandoBridgeAttributes(customFieldsExpando); - + + intPratica.setSueSuapInstanceId(instanceId); + intPratica.setSueSuapClientId(clientId); + intPratica.setSueSuapIpaCode(ipaCode); + // Persist changes to custom fields IntPratica finalizedPratica = IntPraticaLocalServiceUtil.updateIntPratica(intPratica); - item = item.put("intPraticaId", finalizedPratica.getIntPraticaId()); + content = content.put("instanceId", finalizedPratica.getIntPraticaId()); + + StringBuilder sb = new StringBuilder("### ACTION: "+scheduledActionId+" # Sending signal for the success of the create operation +" + + "of the IntPratica: " + finalizedPratica.getIntPraticaId()); + if(_log.isDebugEnabled()){ + _log.debug(sb.toString()); + } + + signalOperationSuccess(scheduledActionId, false, null, companyId); } catch (SystemException e) { + signalOperationFailure(scheduledActionId, e.toString(), companyId, QuarkusBridgeConstants.errorCode); _log.error(e ,e); } catch (PortalException e) { + signalOperationFailure(scheduledActionId, e.toString(), companyId, QuarkusBridgeConstants.errorCode); _log.error(e, e); } - item = item.put("header", Header); - item = item.put("body", Sportello); - createBatchResult.put(item); } - return createBatchResult; } - - private JSONArray prepareReadBatch(long companyId){ + + private void retrieveAndExecuteRead(long companyId){ final String clientContext = "SUAP"; - JSONArray readBatchResult = JSONFactoryUtil.createJSONArray(); - DynamicQuery query = IntPraticaLocalServiceUtil.dynamicQuery(); - query.add(RestrictionsFactoryUtil.eq("companyId", companyId)); - //TODO: scoprire in quali stati possono essere le pratiche ed ottimizzare la query try { - List praticheDaAggiornare = IntPraticaLocalServiceUtil.dynamicQuery(query); - //TODO: splittare le pratiche da aggiornare - - //TODO: ciclare per effettuare gli update delle singole pratiche - for(IntPratica intPratica : praticheDaAggiornare){ - long intPraticaId = intPratica.getIntPraticaId(); - String praticaId = String.valueOf(intPraticaId); - JSONObject object = QuarkusBridgeMessageFactoryUtil.readData(clientContext, praticaId); - JSONArray readPartialResult = JSONFactoryUtil.createJSONArray(); - _log.debug(object.toString()); - JSONArray aggiornamentiPratiche = object.getJSONArray("result"); - for(int i = 0; i < aggiornamentiPratiche.length(); i++){ - JSONObject pratica = aggiornamentiPratiche.getJSONObject(i); - //TODO: remove debug --> - if(true) continue; - ////TODO: remove debug <-- - JSONObject Header = pratica.getJSONObject(QuarkusBridgeConstants.HEADER_REQUEST); - JSONObject Sportello = pratica.getJSONObject(QuarkusBridgeConstants.BODY_REQUEST); - JSONObject Action = pratica.getJSONObject(QuarkusBridgeConstants.SCHEDULED_ACTION); - - String payloadContentType = Sportello.getString(QuarkusBridgeConstants.tipoContenuto); - //TODO: gestire più tipi di payload? (Sia JSONObject che JSONArray??) - String base64Payload = Sportello.getString(QuarkusBridgeConstants.contenuto); - byte[] decodedBytes = DatatypeConverter.parseBase64Binary(base64Payload); - JSONObject payload = JSONFactoryUtil.createJSONObject(new String(decodedBytes)); + JSONObject object = QuarkusBridgeMessageFactoryUtil.readData(clientContext, companyId); + _log.debug(object.toString()); + JSONArray pratiche = object.getJSONArray("result"); + for(int i = 0; i < pratiche.length(); i++){ + JSONObject pratica = pratiche.getJSONObject(i); + JSONObject Header = pratica.getJSONObject(QuarkusBridgeConstants.HEADER_REQUEST); + JSONObject Sportello = pratica.getJSONObject(QuarkusBridgeConstants.BODY_REQUEST); + JSONObject Action = pratica.getJSONObject(QuarkusBridgeConstants.SCHEDULED_ACTION); + String scheduledActionId = Action.getString("id"); + + String payloadContentType = Sportello.getString(QuarkusBridgeConstants.tipoContenuto); + //TODO: gestire pi� tipi di payload? (Sia JSONObject che JSONArray??) + String base64Payload = Sportello.getString(QuarkusBridgeConstants.contenuto); + byte[] decodedBytes = DatatypeConverter.parseBase64Binary(base64Payload); + String contentString = new String(decodedBytes); + if(_log.isDebugEnabled()){ + _log.debug("### ACTION: "+scheduledActionId+" # Content Value: " + contentString); + } + JSONObject payload = null; + if(contentString.charAt(0) == '{'){ + payload = JSONFactoryUtil.createJSONObject(contentString); + } + if(contentString.charAt(0) == '['){ + JSONArray payloadArray = JSONFactoryUtil.createJSONArray(contentString); + payload = payloadArray.getJSONObject(0); + } + Long quarkusIntPraticaId = payload.getLong(QuarkusBridgeConstants.instanceId); + String sueSuapId = Sportello.getString(QuarkusBridgeConstants.instanceId); + IntPratica intPratica = + IntPraticaLocalServiceUtil.fetchByIntPraticaId_SueSuapInstanceId(quarkusIntPraticaId, sueSuapId); + + if(Validator.isNotNull(intPratica)){ + long intPraticaId = intPratica.getIntPraticaId(); JSONObject instance = serializeInstance(intPratica, clientContext); - instance.put("scheduled_action_id", Action.getLong("id")); switch(payloadContentType){ - case "INSTANCE_READ": - instance.put("operation", "INSTANCE_READ"); - instance.put("esito", true); - readPartialResult.put(instance); - break; - case "DATA_READ": - _log.debug("Reading current Data from database for Pratica with Id "+ intPraticaId); - JSONObject currentData = readDataPratica(payload, intPraticaId); - if(currentData.length() == 0){ - currentData.put("esito", false); - _log.error("Unable to read Data from database for Pratica with Id "+ intPraticaId); - } else { - currentData.put("esito", true); - } - instance.put("operation", "DATA_READ"); - instance.put("DATA_READ", currentData); - readPartialResult.put(instance); - break; - case "COMPLIANCE_READ": - //TODO: validare i dati - break; - default: - _log.debug(pratica.toString()); - break; + case "INSTANCE_READ": + signalOperationSuccess(scheduledActionId, false, instance, companyId); + break; + case "DATA_READ": + _log.debug("Reading current Data from database for Pratica with Id "+ intPraticaId); + JSONObject currentData = readDataPratica(payload, intPraticaId); + if(currentData.length() == 0){ + String message = "Unable to read Data from database for Pratica with Id "+ intPraticaId; + _log.error(message); + signalOperationFailure(scheduledActionId, message, companyId, QuarkusBridgeConstants.errorCode); + } else { + signalOperationSuccess(scheduledActionId, false, currentData, companyId); + } + break; + case "COMPLIANCE_READ": + //TODO: validare i dati + break; + default: + _log.debug(pratica.toString()); + break; } + } else { + String message = "No IntPratica found for intPraticaId: " + quarkusIntPraticaId + " and ActionId: " + scheduledActionId; + _log.error(message); + signalOperationFailure(scheduledActionId, message, companyId, QuarkusBridgeConstants.errorCode); } - readBatchResult.put(readPartialResult); } } catch (Exception e) { _log.error(e,e); } - return readBatchResult; } - + private JSONObject serializeInstance(IntPratica pratica, String context){ JSONObject INSTANCE = JSONFactoryUtil.createJSONObject(); INSTANCE.put("context", context); String url = "" ; - + //TODO: retrieve url for json answer INSTANCE.put("url", url); String instanceId = String.valueOf(pratica.getIntPraticaId()); INSTANCE.put("instanceId", instanceId); - - String ipaCode = ""; - //TODO: retrieve ipaCode - String clientId = ""; + + String ipaCode = pratica.getSueSuapIpaCode(); + String clientId = pratica.getSueSuapClientId(); //TODO: retrieve clientId - + String proceedingType = pratica.getTipoProcedura(); INSTANCE.put("proceedingType", proceedingType); INSTANCE.put("content", JSONFactoryUtil.looseSerialize(pratica)); + return INSTANCE; } - - private JSONArray prepareUpdateBatch(long companyId){ + + private void retrieveAndExecuteUpdate(long companyId){ final String clientContext = "SUAP"; - JSONArray updateResult = JSONFactoryUtil.createJSONArray(); - DynamicQuery query = IntPraticaLocalServiceUtil.dynamicQuery(); - query.add(RestrictionsFactoryUtil.eq("companyId", companyId)); - //TODO: scoprire in quali stati possono essere le pratiche ed ottimizzare la query try { - List praticheDaAggiornare = IntPraticaLocalServiceUtil.dynamicQuery(query); - //TODO: splittare le pratiche da aggiornare - - for(IntPratica intPratica : praticheDaAggiornare){ - long intPraticaId = intPratica.getIntPraticaId(); - String praticaId = String.valueOf(intPraticaId); - JSONObject object = QuarkusBridgeMessageFactoryUtil.writeUpdateData(clientContext, praticaId); + JSONObject object = QuarkusBridgeMessageFactoryUtil.writeUpdateData(clientContext, companyId); + if(_log.isDebugEnabled()){ _log.debug(object.toString()); - if(object.length() == 0) continue; - JSONArray updatePartialResult = JSONFactoryUtil.createJSONArray(); // Batch delle operazioni completate su una IntPratica - JSONArray aggiornamentiPratiche = object.getJSONArray("result"); - - for(int i = 0; i < aggiornamentiPratiche.length(); i++){ - JSONObject pratica = aggiornamentiPratiche.getJSONObject(i); - //TODO: remove debug --> - if(true) continue; - ////TODO: remove debug <-- - JSONObject Header = pratica.getJSONObject(QuarkusBridgeConstants.HEADER_REQUEST); - JSONObject Sportello = pratica.getJSONObject(QuarkusBridgeConstants.BODY_REQUEST); - JSONObject Action = pratica.getJSONObject(QuarkusBridgeConstants.SCHEDULED_ACTION); - - String payloadContentType = Sportello.getString(QuarkusBridgeConstants.tipoContenuto); - //TODO: gestire più tipi di payload? (Sia JSONObject che JSONArray??) - String base64Payload = Sportello.getString(QuarkusBridgeConstants.contenuto); - byte[] decodedBytes = DatatypeConverter.parseBase64Binary(base64Payload); - JSONObject payload = JSONFactoryUtil.createJSONObject(new String(decodedBytes)); + } + JSONArray aggiornamentiPratiche = object.getJSONArray("result"); + + for(int i = 0; i < aggiornamentiPratiche.length(); i++){ + JSONObject pratica = aggiornamentiPratiche.getJSONObject(i); + //TODO: remove debug --> + // if(true) continue; + ////TODO: remove debug <-- + JSONObject Header = pratica.getJSONObject(QuarkusBridgeConstants.HEADER_REQUEST); + JSONObject Sportello = pratica.getJSONObject(QuarkusBridgeConstants.BODY_REQUEST); + JSONObject Action = pratica.getJSONObject(QuarkusBridgeConstants.SCHEDULED_ACTION); + String scheduledActionId = Action.getString("id"); + String payloadContentType = Sportello.getString(QuarkusBridgeConstants.tipoContenuto); + //TODO: gestire pi� tipi di payload? (Sia JSONObject che JSONArray??) + String base64Payload = Sportello.getString(QuarkusBridgeConstants.contenuto); + byte[] decodedBytes = DatatypeConverter.parseBase64Binary(base64Payload); + String contentString = new String(decodedBytes); + if(_log.isDebugEnabled()){ + _log.debug("### ACTION: "+scheduledActionId+" # Content Value: " + contentString); + } + JSONObject payload = null; + if(contentString.charAt(0) == '{'){ + payload = JSONFactoryUtil.createJSONObject(contentString); + } + if(contentString.charAt(0) == '['){ + JSONArray payloadArray = JSONFactoryUtil.createJSONArray(contentString); + payload = payloadArray.getJSONObject(0); + } + + Long quarkusIntPraticaId = payload.getLong(QuarkusBridgeConstants.instanceId); + String sueSuapId = Sportello.getString(QuarkusBridgeConstants.instanceId); + IntPratica intPratica = + IntPraticaLocalServiceUtil.fetchByIntPraticaId_SueSuapInstanceId(quarkusIntPraticaId, sueSuapId); + + if(Validator.isNotNull(intPratica)){ + long intPraticaId = intPratica.getIntPraticaId(); JSONObject instance = serializeInstance(intPratica, clientContext); - instance.put("scheduled_action_id", Action.getLong("id")); + // instance.put("scheduled_action_id", Action.getLong("id")); switch(payloadContentType){ - case "INSTANCE_DELETE": // Elimina la pratica + case "INSTANCE_DELETE": // Elimina la pratica + if(_log.isDebugEnabled()){ _log.debug("Checking if we can delete Instance of Pratica with Id " + intPraticaId); - if (PraticaValidator.canDeletePratica(intPratica.getIntPraticaId())){ + } + if (PraticaValidator.canDeletePratica(intPratica.getIntPraticaId())){ + if(_log.isDebugEnabled()){ _log.debug("Deleting Instance of Pratica with Id " + intPraticaId); - IntPraticaLocalServiceUtil.deleteIntPratica(intPratica, false); - instance.put("esito", true); - } else { - _log.debug("Cannot delete Instance of Pratica with Id "+ intPraticaId); - instance.put("esito", false); } - instance.put("operation", "INSTANCE_DELETE"); - updatePartialResult.put(instance); - break; - case "DATA_WRITE": // Aggiorna i dati dei campi del DettPratica associato ad IntPratica - _log.debug("Writing new data to database for Pratica with Id "+ intPraticaId); - JSONObject currentData = writeData(payload, intPraticaId); - if(currentData.length() == 0){ - instance.put("esito", false); - _log.error("Unable to write Data data database for Pratica with Id "+ intPraticaId); - } else { - instance.put("esito", true); + IntPraticaLocalServiceUtil.deleteIntPratica(intPratica, false); + signalOperationSuccess(scheduledActionId, false, null, companyId); + } else { + String message = "Cannot delete Instance of Pratica with Id "+ intPraticaId; + if(_log.isDebugEnabled()){ + _log.debug(message); + } + signalOperationFailure(scheduledActionId, message, companyId, QuarkusBridgeConstants.errorCode); + } + break; + case "DATA_WRITE": // Aggiorna i dati dei campi del DettPratica associato ad IntPratica + _log.debug("Writing new data to database for Pratica with Id "+ intPraticaId); + JSONObject currentData = writeData(payload, intPraticaId); + if(currentData.length() == 0){ + String message = "Unable to write Data data database for Pratica with Id "+ intPraticaId; + _log.error(message); + signalOperationFailure(scheduledActionId, message, companyId, QuarkusBridgeConstants.errorCode); + } else { + if(_log.isDebugEnabled()){ _log.debug("Data written to database for Pratica with Id "+ intPraticaId); } - instance.put("operation", "DATA_WRITE"); - instance.put("DATA_WRITE", currentData); - updatePartialResult.put(instance); - break; - case "DATA_DELETE": // Elimina i dati dei campi del DettPratica associato ad IntPratica - //TODO: eliminazione dati dentro entità - break; - default: + signalOperationSuccess(scheduledActionId, false, null, companyId); + } + break; + case "DATA_DELETE": // Elimina i dati dei campi del DettPratica associato ad IntPratica + //TODO: eliminazione dati dentro entit� + break; + default: + if(_log.isDebugEnabled()){ _log.debug(pratica.toString()); - break; + } + break; } + } else { + String message = "No IntPratica found for intPraticaId: " + quarkusIntPraticaId + " and ActionId: " + scheduledActionId; + _log.error(message); + signalOperationFailure(scheduledActionId, message, companyId, QuarkusBridgeConstants.errorCode); } } } catch (SystemException | PortalException e) { _log.error(e,e); } - return updateResult; } - + protected JSONObject readDataPratica(JSONObject payload, long intPraticaId){ JSONObject result = JSONFactoryUtil.createJSONObject(); String dataType = payload.getJSONObject("data").getString("dataType"); switch(dataType){ - case QuarkusBridgeConstants.DataTypes.MAIN_DETAILS: - JSONArray TC = TipologiaCostruttivaUtil.getTipologiaCostruttiva(intPraticaId); - if(TC.length() > 0) result.put("constructionType", TC.getJSONObject(0)); - - JSONArray description = DescrizioneUtil.getDescrizione(intPraticaId); - if(description.length() > 0) result.put("description", description.getJSONObject(0)); - - JSONArray destination = DestinazioneUtil.getDestinazione(intPraticaId); - if(destination.length() > 0) result.put("destination", destination.getJSONObject(0)); - - JSONArray tipoInterventoANDNormativa = TipologieInterventoUtil.getTipologiaIntervento(intPraticaId); - if(tipoInterventoANDNormativa.length() > 0) { - result.put("projectType", tipoInterventoANDNormativa.getJSONObject(0) - .getJSONObject("projectType")); - result.put("regulatory", tipoInterventoANDNormativa.getJSONObject(0) - .getJSONObject("regulatory")); - } + case QuarkusBridgeConstants.DataTypes.MAIN_DETAILS: + JSONArray TC = TipologiaCostruttivaUtil.getTipologiaCostruttiva(intPraticaId); + if(TC.length() > 0) result.put("constructionType", TC.getJSONObject(0)); + + JSONArray description = DescrizioneUtil.getDescrizione(intPraticaId); + if(description.length() > 0) result.put("description", description.getJSONObject(0)); + + JSONArray destination = DestinazioneUtil.getDestinazione(intPraticaId); + if(destination.length() > 0) result.put("destination", destination.getJSONObject(0)); + + JSONArray tipoInterventoANDNormativa = TipologieInterventoUtil.getTipologiaIntervento(intPraticaId); + if(tipoInterventoANDNormativa.length() > 0) { + result.put("projectType", tipoInterventoANDNormativa.getJSONObject(0) + .getJSONObject("projectType")); + result.put("regulatory", tipoInterventoANDNormativa.getJSONObject(0) + .getJSONObject("regulatory")); + } break; - case QuarkusBridgeConstants.DataTypes.ACTORS: - JSONArray actors = payload.getJSONArray("actors"); - JSONArray partial = JSONFactoryUtil.createJSONArray(); - for(int i = 0; i < actors.length() ; i++){ - JSONObject soggetto = actors.getJSONObject(i); - JSONArray actor = SoggettiUtil.getSoggetto(soggetto, intPraticaId); - if(actor.length() > 0) partial.put(actor.getJSONObject(0)); - } - result.put("actors", partial); + case QuarkusBridgeConstants.DataTypes.ACTORS: + JSONArray actors = payload.getJSONArray("actors"); + JSONArray partial = JSONFactoryUtil.createJSONArray(); + for(int i = 0; i < actors.length() ; i++){ + JSONObject soggetto = actors.getJSONObject(i); + JSONArray actor = SoggettiUtil.getSoggetto(soggetto, intPraticaId); + if(actor.length() > 0) partial.put(actor.getJSONObject(0)); + } + result.put("actors", partial); break; - case QuarkusBridgeConstants.DataTypes.ATTACHMENTS_WITH_FILE: - JSONArray attachments = AllegatiUtil.recuperaDocumentiAllegatiPratica(intPraticaId); - result.put("attachments", attachments); + case QuarkusBridgeConstants.DataTypes.ATTACHMENTS_WITH_FILE: + JSONArray attachments = AllegatiUtil.recuperaDocumentiAllegatiPratica(intPraticaId); + result.put("attachments", attachments); break; - case QuarkusBridgeConstants.DataTypes.WORK_DESCRIPTION: - //TODO: aspettare che vengano definite le buildingMetrics + case QuarkusBridgeConstants.DataTypes.WORK_DESCRIPTION: + //TODO: aspettare che vengano definite le buildingMetrics break; } return result; } - + protected JSONObject writeData(JSONObject payload, long intPraticaId){ String dataType = payload.getJSONObject("data").getString("dataType"); switch(dataType){ - case QuarkusBridgeConstants.DataTypes.MAIN_DETAILS: - JSONObject constructionType = payload.getJSONObject("constructionType"); - TipologiaCostruttivaUtil.aggiornaTipologiaCostruttiva(intPraticaId, constructionType); - JSONObject description = payload.getJSONObject("description"); - DescrizioneUtil.aggiornaDescrizione(intPraticaId, description); - JSONObject destination = payload.getJSONObject("destination"); - DestinazioneUtil.aggiornaDestinazione(intPraticaId, destination); - JSONObject projectType = payload.getJSONObject("projectType"); - TipologieInterventoUtil.aggiornaTipologieIntervento(intPraticaId, projectType); + case QuarkusBridgeConstants.DataTypes.MAIN_DETAILS: + JSONObject constructionType = payload.getJSONObject("constructionType"); + TipologiaCostruttivaUtil.aggiornaTipologiaCostruttiva(intPraticaId, constructionType); + JSONObject description = payload.getJSONObject("description"); + DescrizioneUtil.aggiornaDescrizione(intPraticaId, description); + JSONObject destination = payload.getJSONObject("destination"); + DestinazioneUtil.aggiornaDestinazione(intPraticaId, destination); + JSONObject projectType = payload.getJSONObject("projectType"); + TipologieInterventoUtil.aggiornaTipologieIntervento(intPraticaId, projectType); break; - case QuarkusBridgeConstants.DataTypes.ACTORS: - JSONArray actors = payload.getJSONArray("actors"); - for(int i = 0; i < actors.length() ; i++){ - JSONObject soggetto = actors.getJSONObject(i); - SoggettiUtil.aggiornaSoggetto(soggetto, intPraticaId); - } + case QuarkusBridgeConstants.DataTypes.ACTORS: + JSONArray actors = payload.getJSONArray("actors"); + for(int i = 0; i < actors.length() ; i++){ + JSONObject soggetto = actors.getJSONObject(i); + SoggettiUtil.aggiornaSoggetto(soggetto, intPraticaId); + } break; - case QuarkusBridgeConstants.DataTypes.ATTACHMENTS_WITH_FILE: - JSONArray attachments = payload.getJSONArray("attachments"); - for(int i = 0; i < attachments.length() ; i++){ - JSONObject fileObject = attachments.getJSONObject(i); - Object file = AllegatiUtil.aggiungiDocumentoPratica(fileObject, intPraticaId); - if(Validator.isNull(file)) _log.error("Unable to add attachment "+fileObject.toString()); - else _log.debug("Attachment added to pratica with id "+intPraticaId); - } + case QuarkusBridgeConstants.DataTypes.ATTACHMENTS_WITH_FILE: + JSONArray attachments = payload.getJSONArray("attachments"); + for(int i = 0; i < attachments.length() ; i++){ + JSONObject fileObject = attachments.getJSONObject(i); + Object file = AllegatiUtil.aggiungiDocumentoPratica(fileObject, intPraticaId); + if(Validator.isNull(file)) _log.error("Unable to add attachment "+fileObject.toString()); + else _log.debug("Attachment added to pratica with id "+intPraticaId); + } break; - case QuarkusBridgeConstants.DataTypes.WORK_DESCRIPTION: - //TODO: aspettare che vengano definite le buildingMetrics + case QuarkusBridgeConstants.DataTypes.WORK_DESCRIPTION: + //TODO: aspettare che vengano definite le buildingMetrics break; } return readDataPratica(payload, intPraticaId); diff --git a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath index aac20d15..095394ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/schedulatore-portos-pratiche-portlet/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -20,5 +15,10 @@ + + + + +