remove smell code

Author: carlosthe19916

src/main/java/io/github/project/openubl/xmlsenderws/webservices/xml/DocumentType.java

@@ -29,19 +29,19 @@ public enum DocumentType {
     RETENTION("Retention"),
     DESPATCH_ADVICE("DespatchAdvice");
 
-    private final String documentType;
+    private final String type;
 
-    DocumentType(String documentType) {
-        this.documentType = documentType;
+    DocumentType(String type) {
+        this.type = type;
     }
 
-    public String getDocumentType() {
-        return documentType;
+    public String getType() {
+        return type;
     }
 
     public static Optional<DocumentType> valueFromDocumentType(String documentType) {
         return Stream.of(DocumentType.values())
-                .filter(p -> p.getDocumentType().equals(documentType))
+                .filter(p -> p.getType().equals(documentType))
                 .findFirst();
     }
 }

src/main/java/io/github/project/openubl/xmlsenderws/webservices/xml/XmlHandler.java

@@ -105,12 +105,11 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
                     documentID = content;
                 }
 
-                if (isAccountingSupplierPartyBeingRead && isPartyBeingRead && isPartyIdentificationBeingRead) {
+                if ((isAccountingSupplierPartyBeingRead && isPartyBeingRead && isPartyIdentificationBeingRead)
+                        || (isAgentPartyBeingRead && isPartyIdentificationBeingRead)
+                ) {
                     // invoice, credit-note, debit-note
                     ruc = content;
-                } else if (isAgentPartyBeingRead && isPartyIdentificationBeingRead) {
-                    // perception, retention
-                    ruc = content;
                 }
             } else if (currentElement.equals(CUSTOMER_ASSIGNED_ACCOUNT_ID) && uri.equals(CBC)) {
                 // voided-document, summary-document, despatch-advice

src/test/java/io/github/project/openubl/xmlsenderws/webservices/managers/BillValidServiceManagerTest.java

@@ -50,7 +50,7 @@ public void getStatus() throws IOException, URISyntaxException {
 
         try {
             StatusResponse status = BillValidServiceManager.getStatus(file, config);
-            assertNotEquals(status.getStatusCode(), "0000");
+            assertNotEquals("0000", status.getStatusCode());
         } catch (SOAPFaultException e) {
             // Las consultas deben de hacerse con un usuario y constraseña de produccion.
             exceptionWasThrew = true;

src/test/java/io/github/project/openubl/xmlsenderws/webservices/xml/XmlContentProviderTest.java

@@ -38,7 +38,7 @@ public void getSunatDocument_invoice() throws IOException, SAXException, ParserC
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.INVOICE.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.INVOICE.getType(), model.getDocumentType());
         assertEquals("F001-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -55,7 +55,7 @@ public void getSunatDocument_invoice_withExtensionContent() throws IOException,
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.INVOICE.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.INVOICE.getType(), model.getDocumentType());
         assertEquals("F001-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -72,7 +72,7 @@ public void getSunatDocument_creditNote() throws IOException, SAXException, Pars
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.CREDIT_NOTE.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.CREDIT_NOTE.getType(), model.getDocumentType());
         assertEquals("BC01-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -89,7 +89,7 @@ public void getSunatDocument_debitNote() throws IOException, SAXException, Parse
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.DEBIT_NOTE.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.DEBIT_NOTE.getType(), model.getDocumentType());
         assertEquals("BD01-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -106,7 +106,7 @@ public void getSunatDocument_voidedDocument() throws IOException, SAXException,
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.VOIDED_DOCUMENT.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.VOIDED_DOCUMENT.getType(), model.getDocumentType());
         assertEquals("RA-20191224-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertEquals("01", model.getVoidedLineDocumentTypeCode());
@@ -123,7 +123,7 @@ public void getSunatDocument_summaryDocument() throws IOException, SAXException,
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.SUMMARY_DOCUMENT.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.SUMMARY_DOCUMENT.getType(), model.getDocumentType());
         assertEquals("RC-20191224-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -140,7 +140,7 @@ public void getSunatDocument_perception() throws IOException, SAXException, Pars
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.PERCEPTION.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.PERCEPTION.getType(), model.getDocumentType());
         assertEquals("P001-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -157,7 +157,7 @@ public void getSunatDocument_retention() throws IOException, SAXException, Parse
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.RETENTION.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.RETENTION.getType(), model.getDocumentType());
         assertEquals("R001-1", model.getDocumentID());
         assertEquals("12345678912", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());
@@ -174,7 +174,7 @@ public void getSunatDocument_despatchAdvice() throws IOException, SAXException,
 
         // Then
         assertNotNull(model);
-        assertEquals(DocumentType.DESPATCH_ADVICE.getDocumentType(), model.getDocumentType());
+        assertEquals(DocumentType.DESPATCH_ADVICE.getType(), model.getDocumentType());
         assertEquals("T001-123", model.getDocumentID());
         assertEquals("20123456789", model.getRuc());
         assertNull(model.getVoidedLineDocumentTypeCode());