Skip to content

Commit 9cf9e5b

Browse files
Samuel-OliveiraSamuel-Oliveira
committed
Merge branch 'release/4.00.27'
2 parents 350d06e + 65701d9 commit 9cf9e5b

File tree

6 files changed

+29
-15
lines changed

6 files changed

+29
-15
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Notas de versão
22

3-
- Atualizado Cacert MG
3+
- Atualizado Cacert MT
4+
- Adicionado Conversao para RetDistDFeInt

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Java-NFe [![MIT License](https://img.shields.io/github/license/Samuel-Oliveira/Java_NFe.svg) ](https://github.com/Samuel-Oliveira/Java_NFe/blob/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/br.com.swconsultoria/java-nfe.svg?label=Maven%20Central)](https://search.maven.org/artifact/br.com.swconsultoria/java-nfe/4.00.26/jar)
1+
# Java-NFe [![MIT License](https://img.shields.io/github/license/Samuel-Oliveira/Java_NFe.svg) ](https://github.com/Samuel-Oliveira/Java_NFe/blob/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/br.com.swconsultoria/java-nfe.svg?label=Maven%20Central)](https://search.maven.org/artifact/br.com.swconsultoria/java-nfe/4.00.27/jar)
22
Biblioteca Java para consumo do WebService de NFe/NFCe
33

44
## Dúvidas, Sugestões ou Consultoria
@@ -17,7 +17,7 @@ Para Iniciar :
1717
<dependency>
1818
<groupId>br.com.swconsultoria</groupId>
1919
<artifactId>java-nfe</artifactId>
20-
<version>4.00.26</version>
20+
<version>4.00.27</version>
2121
</dependency>
2222
```
2323

@@ -29,7 +29,7 @@ repositories {
2929
}
3030
}
3131
dependencies {
32-
implementation "br.com.swconsultoria:java-nfe:4.00.26"
32+
implementation "br.com.swconsultoria:java-nfe:4.00.27"
3333
}
3434
```
3535

@@ -39,8 +39,12 @@ ________________________________________________________________________________
3939

4040
# Historico de Versões
4141

42+
## v4.00.26 - 26/11/2023 - Schemas PL.009k
43+
- Atualizado Cacert MT
44+
- Adicionado Conversao para RetDistDFeInt
45+
4246
## v4.00.26 - 21/08/2023 - Schemas PL.009k
43-
- - Atualizado Cacert MG
47+
- Atualizado Cacert MG
4448

4549
## v4.00.25 - 30/07/2023 - Schemas PL.009k
4650
- Corrigido erro Inutilizacão CE

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>br.com.swconsultoria</groupId>
44
<artifactId>java-nfe</artifactId>
5-
<version>4.00.27-SNAPSHOT</version>
5+
<version>4.00.28-SNAPSHOT</version>
66
<name>Java_NFe</name>
77
<description>Api java para consumo do webService de nota fiscal eletronica</description>
88
<url>https://github.com/Samuel-Oliveira/Java_NFe</url>
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>br.com.swconsultoria</groupId>
8686
<artifactId>java_certificado</artifactId>
87-
<version>2.11</version>
87+
<version>2.13</version>
8888
</dependency>
8989
<!-- Ini4J -->
9090
<dependency>

‎src/main/java/br/com/swconsultoria/nfe/dom/ConfiguracoesNfe.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static ConfiguracoesNfe criarConfiguracoes(EstadosEnum estado, AmbienteEn
109109

110110
if (Logger.getLogger("").isLoggable(Level.SEVERE)) {
111111
System.err.println("####################################################################");
112-
System.err.println(" Api Java Nfe - Versão 4.00.26 - 21/08/2023");
112+
System.err.println(" Api Java Nfe - Versão 4.00.27 - 26/11/2023");
113113
if (Logger.getLogger("").isLoggable(Level.WARNING)) {
114114
System.err.println(" Samuel Olivera - [email protected] ");
115115
}

‎src/main/java/br/com/swconsultoria/nfe/util/XmlNfeUtil.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import javax.xml.transform.stream.StreamSource;
2828
import java.io.*;
2929
import java.nio.charset.Charset;
30+
import java.nio.charset.StandardCharsets;
3031
import java.nio.file.Files;
3132
import java.nio.file.Paths;
3233
import java.security.InvalidParameterException;
@@ -48,6 +49,8 @@
4849
@Log
4950
public class XmlNfeUtil {
5051

52+
private XmlNfeUtil(){}
53+
5154
private static final String STATUS = "TConsStatServ";
5255
private static final String SITUACAO_NFE = "TConsSitNFe";
5356
private static final String ENVIO_NFE = "TEnviNFe";
@@ -65,30 +68,25 @@ public class XmlNfeUtil {
6568
private static final String RET_RECIBO_NFE = "TRetConsReciNFe";
6669
private static final String RET_STATUS_SERVICO = "TRetConsStatServ";
6770
private static final String RET_CONS_CAD = "TRetConsCad";
68-
71+
private static final String RET_DIST_DFE = "RetDistDFeInt";
6972
private static final String RET_ENV_EVENTO = "TRetEnvEvento";
70-
7173
private static final String RET_INUT_NFE = "TRetInutNFe";
72-
7374
private static final String TPROCCANCELAR = "br.com.swconsultoria.nfe.schema.envEventoCancNFe.TProcEvento";
7475
private static final String TPROCATORINTERESSADO = "br.com.swconsultoria.nfe.schema.envEventoAtorInteressado.TProcEvento";
7576
private static final String TPROCCANCELARSUBST = "br.com.swconsultoria.nfe.schema.envEventoCancSubst.TProcEvento";
7677
private static final String TPROCCCE = "br.com.swconsultoria.nfe.schema.envcce.TProcEvento";
7778
private static final String TPROCEPEC = "br.com.swconsultoria.nfe.schema.envEpec.TProcEvento";
7879
private static final String TPROCMAN = "br.com.swconsultoria.nfe.schema.envConfRecebto.TProcEvento";
79-
8080
private static final String TProtNFe = "TProtNFe";
8181
private static final String TProtEnvi = "br.com.swconsultoria.nfe.schema_4.enviNFe.TProtNFe";
8282
private static final String TProtCons = "br.com.swconsultoria.nfe.schema_4.retConsSitNFe.TProtNFe";
8383
private static final String TProtReci = "br.com.swconsultoria.nfe.schema_4.retConsReciNFe.TProtNFe";
84-
8584
private static final String CANCELAR = "br.com.swconsultoria.nfe.schema.envEventoCancNFe.TEnvEvento";
8685
private static final String ATOR_INTERESSADO = "br.com.swconsultoria.nfe.schema.envEventoAtorInteressado.TEnvEvento";
8786
private static final String CANCELAR_SUBSTITUICAO = "br.com.swconsultoria.nfe.schema.envEventoCancSubst.TEnvEvento";
8887
private static final String CCE = "br.com.swconsultoria.nfe.schema.envcce.TEnvEvento";
8988
private static final String EPEC = "br.com.swconsultoria.nfe.schema.envEpec.TEnvEvento";
9089
private static final String MANIFESTAR = "br.com.swconsultoria.nfe.schema.envConfRecebto.TEnvEvento";
91-
9290
private static final String RET_CANCELAR = "br.com.swconsultoria.nfe.schema.envEventoCancNFe.TRetEnvEvento";
9391
private static final String RET_ATOR_INTERESSADO = "br.com.swconsultoria.nfe.schema.envEventoAtorInteressado.TRetEnvEvento";
9492
private static final String RET_CANCELAR_SUBSTITUICAO = "br.com.swconsultoria.nfe.schema.envEventoCancSubst.TRetEnvEvento";
@@ -191,6 +189,11 @@ public static <T> String objectToXml(Object obj, Charset encode) throws JAXBExce
191189
element = new br.com.swconsultoria.nfe.schema.retConsCad.ObjectFactory().createRetConsCad((br.com.swconsultoria.nfe.schema.retConsCad.TRetConsCad) obj);
192190
break;
193191

192+
case RET_DIST_DFE:
193+
context = JAXBContext.newInstance(br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt.class);
194+
element = XsdUtil.distDFeInt.createRetDistDFeInt((br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt) obj);
195+
break;
196+
194197
case TPROCEVENTO:
195198
switch (obj.getClass().getName()) {
196199
case TPROCCANCELAR:
@@ -351,7 +354,7 @@ public static String gZipToXml(byte[] conteudo) throws IOException {
351354
}
352355
GZIPInputStream gis;
353356
gis = new GZIPInputStream(new ByteArrayInputStream(conteudo));
354-
BufferedReader bf = new BufferedReader(new InputStreamReader(gis, "UTF-8"));
357+
BufferedReader bf = new BufferedReader(new InputStreamReader(gis, StandardCharsets.UTF_8));
355358
StringBuilder outStr = new StringBuilder();
356359
String line;
357360
while ((line = bf.readLine()) != null) {

‎src/main/java/br/com/swconsultoria/nfe/util/XsdUtil.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class XsdUtil {
2020
private static final QName _TRetEnvEvento_QNAME = new QName("http://www.portalfiscal.inf.br/nfe", "retEnvEvento");
2121
private static final QName _TRetInutNFe_QNAME = new QName("http://www.portalfiscal.inf.br/nfe", "retInutNFe");
2222
private static final QName _TDistDFeInt_QNAME = new QName("http://www.portalfiscal.inf.br/nfe", "distDFeInt");
23+
private static final QName _TRetDistDFeInt_QNAME = new QName("http://www.portalfiscal.inf.br/nfe", "retDistDFeInt");
2324

2425
public interface enviNfe {
2526
@XmlElementDecl(namespace = "http://www.portalfiscal.inf.br/nfe", name = "TNfeProc", scope = br.com.swconsultoria.nfe.schema_4.enviNFe.TNfeProc.class)
@@ -43,6 +44,11 @@ public interface distDFeInt {
4344
static JAXBElement<br.com.swconsultoria.nfe.schema.distdfeint.DistDFeInt> createDistDFeInt(br.com.swconsultoria.nfe.schema.distdfeint.DistDFeInt value) {
4445
return new JAXBElement<>(_TDistDFeInt_QNAME, br.com.swconsultoria.nfe.schema.distdfeint.DistDFeInt.class, br.com.swconsultoria.nfe.schema.distdfeint.DistDFeInt.class, value);
4546
}
47+
@XmlElementDecl(namespace = "http://www.portalfiscal.inf.br/nfe", name = "retDistDFeInt", scope = br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt.class)
48+
static JAXBElement<br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt> createRetDistDFeInt(br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt value) {
49+
return new JAXBElement<>(_TRetDistDFeInt_QNAME, br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt.class,
50+
br.com.swconsultoria.nfe.schema.retdistdfeint.RetDistDFeInt.class, value);
51+
}
4652
}
4753

4854
public interface retConsReciNfe {

0 commit comments

Comments
 (0)