Spostamento di package della classe exception ClientException.

link-it · Jun 30, 2021 · 2f7fe11 · 2f7fe11
1 parent 46f6b0f
commit 2f7fe11
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 70 deletions.
diff --git a/jars/core/src/main/java/it/govpay/core/business/Pagamento.java b/jars/core/src/main/java/it/govpay/core/business/Pagamento.java
@@ -69,7 +69,7 @@
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.RptUtils;
 import it.govpay.core.utils.RrUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.client.NodoClient.Azione;
 import it.govpay.core.utils.thread.InviaNotificaThread;

diff --git a/jars/core/src/main/java/it/govpay/core/business/Rendicontazioni.java b/jars/core/src/main/java/it/govpay/core/business/Rendicontazioni.java
@@ -78,7 +78,7 @@
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.JaxbUtils;
 import it.govpay.core.utils.VersamentoUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.client.NodoClient.Azione;
 import it.govpay.model.Fr.StatoFr;

diff --git a/jars/core/src/main/java/it/govpay/core/business/Rpt.java b/jars/core/src/main/java/it/govpay/core/business/Rpt.java
@@ -46,7 +46,7 @@
 import it.govpay.core.utils.SimpleDateFormatUtils;
 import it.govpay.core.utils.UrlUtils;
 import it.govpay.core.utils.VersamentoUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.client.NodoClient.Azione;
 import it.govpay.core.utils.thread.InviaNotificaThread;

diff --git a/jars/core/src/main/java/it/govpay/core/business/Versamento.java b/jars/core/src/main/java/it/govpay/core/business/Versamento.java
@@ -60,7 +60,7 @@
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.IuvUtils;
 import it.govpay.core.utils.VersamentoUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.Iuv.TipoIUV;
 import it.govpay.model.NotificaAppIo.TipoNotifica;
 import it.govpay.model.Versamento.StatoPagamento;

diff --git a/jars/core/src/main/java/it/govpay/core/exceptions/GovPayException.java b/jars/core/src/main/java/it/govpay/core/exceptions/GovPayException.java
@@ -28,7 +28,7 @@
 import it.govpay.core.beans.EsitoOperazione;
 import it.govpay.core.beans.GpResponse;
 import it.govpay.core.beans.Mittente;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.Evento.EsitoEvento;
 
 public class GovPayException extends Exception {

diff --git a/jars/core/src/main/java/it/govpay/core/utils/EventoContext.java b/jars/core/src/main/java/it/govpay/core/utils/EventoContext.java
@@ -13,7 +13,7 @@
 import it.govpay.core.exceptions.BaseExceptionV1;
 import it.govpay.core.exceptions.GovPayException;
 import it.govpay.core.exceptions.UnprocessableEntityException;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.Evento.CategoriaEvento;
 import it.govpay.model.Evento.EsitoEvento;
 import it.govpay.model.Evento.RuoloEvento;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/RptUtils.java b/jars/core/src/main/java/it/govpay/core/utils/RptUtils.java
@@ -63,7 +63,7 @@
 import it.govpay.core.exceptions.GovPayException;
 import it.govpay.core.exceptions.NdpException;
 import it.govpay.core.utils.EventoContext.Esito;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.client.NodoClient.Azione;
 import it.govpay.core.utils.thread.InviaRptThread;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/RrUtils.java b/jars/core/src/main/java/it/govpay/core/utils/RrUtils.java
@@ -69,7 +69,7 @@
 import it.govpay.core.exceptions.NdpException;
 import it.govpay.core.exceptions.NdpException.FaultPa;
 import it.govpay.core.utils.RtUtils.EsitoValidazione;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.thread.InviaNotificaThread;
 import it.govpay.core.utils.thread.ThreadExecutorManager;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/VersamentoUtils.java b/jars/core/src/main/java/it/govpay/core/utils/VersamentoUtils.java
@@ -73,7 +73,7 @@
 import it.govpay.core.exceptions.VersamentoScadutoException;
 import it.govpay.core.exceptions.VersamentoSconosciutoException;
 import it.govpay.core.utils.EventoContext.Esito;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.VerificaClient;
 import it.govpay.core.utils.trasformazioni.TrasformazioniUtils;
 import it.govpay.core.utils.trasformazioni.exception.TrasformazioneException;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/AppIoClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/AppIoClient.java
@@ -31,6 +31,7 @@
 import it.govpay.core.utils.appio.model.LimitedProfile;
 import it.govpay.core.utils.appio.model.MessageCreated;
 import it.govpay.core.utils.appio.model.NewMessage;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.rawutils.ConverterUtils;
 import it.govpay.model.Connettore;
 import it.govpay.model.Connettore.EnumAuthType;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/BasicClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/BasicClient.java
@@ -72,6 +72,7 @@
 import it.govpay.core.utils.EventoContext.Categoria;
 import it.govpay.core.utils.EventoContext.Componente;
 import it.govpay.core.utils.GovpayConfig;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.handler.IntegrationContext;
 import it.govpay.core.utils.client.handler.IntegrationOutHandler;
 import it.govpay.core.utils.rawutils.ConverterUtils;
@@ -86,62 +87,6 @@ public abstract class BasicClient {
 	private static final String SOAP_ACTION = "SOAPAction";
 	private static Logger log = LoggerWrapperFactory.getLogger(BasicClient.class);
 
-	public class ClientException extends Exception {
-		private static final long serialVersionUID = 1L;
-		private Integer responseCode = null;
-		private byte[] responseContent = null;
-
-		public ClientException(String message, Exception e, Integer responseCode) {
-			this(message, e, responseCode, null);
-		}
-
-		public ClientException(Exception e, Integer responseCode) {
-			this(e, responseCode, null);
-		}
-
-		public ClientException(String string, Integer responseCode) {
-			this(string, responseCode, null);
-		}
-
-		public ClientException(String message, Exception e) {
-			super(message, e);
-		}
-
-		public ClientException(Exception e) {
-			super(e);
-		}
-
-		public ClientException(String string) {
-			super(string);
-		}
-
-		public ClientException(Exception e, Integer responseCode, byte[] responseContent) {
-			super(e);
-			this.responseCode = responseCode;
-			this.responseContent = responseContent;
-		}
-
-		public ClientException(String string, Integer responseCode, byte[] responseContent) {
-			super(string);
-			this.responseCode = responseCode;
-			this.responseContent = responseContent;
-		}
-
-		public ClientException(String message, Exception e, Integer responseCode, byte[] responseContent) {
-			super(message, e);
-			this.responseCode = responseCode;
-			this.responseContent = responseContent;
-		}
-
-		public Integer getResponseCode() {
-			return this.responseCode;
-		}
-
-		public byte[] getResponseContent () {
-			return this.responseContent;
-		}
-	}
-
 	protected static Map<String, SSLContext> sslContexts = new HashMap<>();
 	protected URL url = null;
 	protected SSLContext sslContext;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/EnteRendicontazioniClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/EnteRendicontazioniClient.java
@@ -33,6 +33,7 @@
 import it.govpay.bd.configurazione.model.Giornale;
 import it.govpay.bd.model.Dominio;
 import it.govpay.core.utils.EventoContext.Componente;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.ConnettoreNotificaPagamenti;
 
 public class EnteRendicontazioniClient extends BasicClient {

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/MyPivotClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/MyPivotClient.java
@@ -39,6 +39,7 @@
 import it.govpay.core.utils.EventoContext.Componente;
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.JaxbUtils;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.ConnettoreNotificaPagamenti;
 
 public class MyPivotClient extends BasicClient {

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/NodoClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/NodoClient.java
@@ -56,6 +56,7 @@
 import it.govpay.core.utils.EventoContext.Componente;
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.JaxbUtils;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.Intermediario;
 import it.govpay.model.Rpt;
 import it.govpay.model.Stazione;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/NotificaClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/NotificaClient.java
@@ -47,6 +47,7 @@
 import it.govpay.core.exceptions.GovPayException;
 import it.govpay.core.exceptions.NdpException;
 import it.govpay.core.utils.EventoContext.Componente;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.v1.NotificaAttivazioneConverter;
 import it.govpay.core.utils.client.v1.NotificaConverter;
 import it.govpay.core.utils.client.v1.NotificaTerminazioneConverter;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/VerificaClient.java b/jars/core/src/main/java/it/govpay/core/utils/client/VerificaClient.java
@@ -46,6 +46,7 @@
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.IuvUtils;
 import it.govpay.core.utils.VersamentoUtils;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.v1.VerificaConverter;
 import it.govpay.core.utils.rawutils.ConverterUtils;
 import it.govpay.core.utils.validator.PendenzaVerificataValidator;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/client/exception/ClientException.java b/jars/core/src/main/java/it/govpay/core/utils/client/exception/ClientException.java
@@ -0,0 +1,57 @@
+package it.govpay.core.utils.client.exception;
+
+public class ClientException extends Exception {
+	private static final long serialVersionUID = 1L;
+	private Integer responseCode = null;
+	private byte[] responseContent = null;
+
+	public ClientException(String message, Exception e, Integer responseCode) {
+		this(message, e, responseCode, null);
+	}
+
+	public ClientException(Exception e, Integer responseCode) {
+		this(e, responseCode, null);
+	}
+
+	public ClientException(String string, Integer responseCode) {
+		this(string, responseCode, null);
+	}
+
+	public ClientException(String message, Exception e) {
+		super(message, e);
+	}
+
+	public ClientException(Exception e) {
+		super(e);
+	}
+
+	public ClientException(String string) {
+		super(string);
+	}
+
+	public ClientException(Exception e, Integer responseCode, byte[] responseContent) {
+		super(e);
+		this.responseCode = responseCode;
+		this.responseContent = responseContent;
+	}
+
+	public ClientException(String string, Integer responseCode, byte[] responseContent) {
+		super(string);
+		this.responseCode = responseCode;
+		this.responseContent = responseContent;
+	}
+
+	public ClientException(String message, Exception e, Integer responseCode, byte[] responseContent) {
+		super(message, e);
+		this.responseCode = responseCode;
+		this.responseContent = responseContent;
+	}
+
+	public Integer getResponseCode() {
+		return this.responseCode;
+	}
+
+	public byte[] getResponseContent () {
+		return this.responseContent;
+	}
+}
diff --git a/jars/core/src/main/java/it/govpay/core/utils/thread/InviaNotificaAppIoThread.java b/jars/core/src/main/java/it/govpay/core/utils/thread/InviaNotificaAppIoThread.java
@@ -34,7 +34,7 @@
 import it.govpay.core.utils.appio.model.MessageCreated;
 import it.govpay.core.utils.appio.model.NewMessage;
 import it.govpay.core.utils.client.AppIoClient;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.validator.ValidatorFactory;
 import it.govpay.core.utils.validator.ValidatoreUtils;
 import it.govpay.model.NotificaAppIo.TipoNotifica;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/thread/InviaNotificaThread.java b/jars/core/src/main/java/it/govpay/core/utils/thread/InviaNotificaThread.java
@@ -47,7 +47,7 @@
 import it.govpay.core.exceptions.GovPayException;
 import it.govpay.core.utils.EventoContext.Esito;
 import it.govpay.core.utils.GpContext;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NotificaClient;
 import it.govpay.model.Connettore;
 import it.govpay.model.Notifica.StatoSpedizione;

diff --git a/jars/core/src/main/java/it/govpay/core/utils/thread/InviaRptThread.java b/jars/core/src/main/java/it/govpay/core/utils/thread/InviaRptThread.java
@@ -49,7 +49,7 @@
 import it.govpay.core.utils.EventoContext.Esito;
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.RptUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.NodoClient;
 import it.govpay.core.utils.client.NodoClient.Azione;
 import it.govpay.model.Intermediario;

diff --git a/...src/main/java/it/govpay/core/utils/thread/SpedizioneTracciatoNotificaPagamentiThread.java b/...src/main/java/it/govpay/core/utils/thread/SpedizioneTracciatoNotificaPagamentiThread.java
@@ -83,7 +83,7 @@
 import it.govpay.core.utils.GovpayConfig;
 import it.govpay.core.utils.GpContext;
 import it.govpay.core.utils.SimpleDateFormatUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.core.utils.client.EnteRendicontazioniClient;
 import it.govpay.core.utils.rawutils.ConverterUtils;
 import it.govpay.core.utils.tracciati.TracciatiNotificaPagamentiUtils;

diff --git a/wars/api-pagopa/src/main/java/it/govpay/web/ws/PagamentiTelematiciCCPImpl.java b/wars/api-pagopa/src/main/java/it/govpay/web/ws/PagamentiTelematiciCCPImpl.java
@@ -89,7 +89,7 @@
 import it.govpay.core.utils.RptBuilder;
 import it.govpay.core.utils.RptUtils;
 import it.govpay.core.utils.VersamentoUtils;
-import it.govpay.core.utils.client.BasicClient.ClientException;
+import it.govpay.core.utils.client.exception.ClientException;
 import it.govpay.model.Canale.ModelloPagamento;
 import it.govpay.model.Canale.TipoVersamento;
 import it.govpay.model.IbanAccredito;