Resolución de conflicto en la documentacion

ctt-gob-es · Oct 20, 2022 · 96e31f6 · 96e31f6
2 parents 4f2a189 + dc2f987
commit 96e31f6
Show file tree

Hide file tree

Showing 2 changed files with 502 additions and 98 deletions.
diff --git a/Integra-parent/Integra-tsl/src/main/java/es/gob/afirma/tsl/ITslValidation.java b/Integra-parent/Integra-tsl/src/main/java/es/gob/afirma/tsl/ITslValidation.java
@@ -17,62 +17,62 @@
  * <b>Project:</b><p>Library for the integration with the services of @Firma, eVisor and TS@.</p>
  * <b>Date:</b><p> 19/11/2020.</p>
  * @author Gobierno de España.
- * @version 1.1, 15/06/2021.
+ * @version 1.2, 26/09/2022.
  */
 package es.gob.afirma.tsl;
 
+import java.util.Date;
 
-import java.util.Map;
-
-
+import es.gob.afirma.tsl.elements.DetectCertInTslInfoAndValidationResponse;
 import es.gob.afirma.tsl.exceptions.TSLManagingException;
 import es.gob.afirma.tsl.parsing.ifaces.ITSLObject;
 import es.gob.afirma.tsl.parsing.impl.common.TSLObject;
 
 /** 
  * <p>Interface that publishes the necessary methods to perform certificate validation through a TSL.</p>
  * <b>Project:</b><p>Library for the integration with the services of @Firma, eVisor and TS@.</p>
- * @version 1.1, 15/06/2021.
+ * @version 1.2, 26/09/2022.
  */
 public interface ITslValidation {
 
+    /**
+     * Constant attribute that represents the token parameter 'certificate'.
+     */
+    String PARAM_CERTIFICATE = "certificate";
+
+    /**
+     * Constant attribute that represents the token parameter 'tslObject'.
+     */
+    String PARAM_TSLOBJECT = "tslObject";
+
+    /**
+     * Method that validates a certificate with a given TSL.
+     * 
+     * @param certByteArrayB64 Certificate to detect (byte[] in Base64 encoded).
+     * @param tslObject TSL object representation to use.
+     * @param date Date to use to detect and validate the input certificate.
+     * 	 * @param getInfo Flag that indicates if it is necessary to get the certificate information in response.
+     * @param checkRevStatus Flag that indicates if it is necessary to check the revocation status of the input certificate.
+     * @return Structure with detected certificate in TSL and revocation status.
+     * @throws TSLManagingException If some error is produced in the execution of the service.
+     */
+    public DetectCertInTslInfoAndValidationResponse validateCertificateTsl(byte[ ] certByteArrayB64, TSLObject tslObject, Date date, boolean getInfo, boolean checkRevStatus) throws TSLManagingException;
 
-	/**
-	 * Constant attribute that represents the token parameter 'certificate'.
-	 */
-	String PARAM_CERTIFICATE = "certificate";
-
-	/**
-	 * Constant attribute that represents the token parameter 'tslObject'.
-	 */
-	String PARAM_TSLOBJECT = "tslObject";
-
-	/**
-	 *  Method to obtain the TSL mapped from a file.
-	 *  
-	 * @param pathTsl Path where the file with the TSL is located.
-	 * @return  a TSL Data Object representation.
-	 * @throws TSLManagingException In case of some error getting the information from the file.
-	 */
-	ITSLObject getTSLObjectFromPath(String pathTsl) throws TSLManagingException;
-
-	/**
-	 * MEthod that downloads a TSL from a specified URI
-	 * 
-	 * @param uriTSL RL from where the TSL will be downloaded.
-	 * @return a TSL Data Object representation.
-	 * @throws TSLManagingException  In case of some error getting the information from the file.
-	 */
-	ITSLObject downloadTLSbyHTTP(String uriTSL, int connectionTimeout, int readTimeout) throws TSLManagingException ;
-
-
-	/**
-	 * Method to obtain the logical fields from the date of issuance of the certificate.
-	 * 
-	 * @param certByteArrayB64 Certificate to detect (byte[] in Base64 encoded).
-	 * @param tslObject TSL object representation to use.
+    /**
+     *  Method to obtain the TSL mapped from a file.
+     *  
+     * @param pathTsl Path where the file with the TSL is located.
+     * @return  a TSL Data Object representation.
+     * @throws TSLManagingException In case of some error getting the information from the file.
+     */
+    ITSLObject getTSLObjectFromPath(String pathTsl) throws TSLManagingException;
 
-	 * @throws TSLManagingException If some error is produced in the execution of the service.
-	 */
-	public Map<String, String> getLogicalFieldsTSL(byte[] certByteArrayB64, TSLObject tslObject) throws TSLManagingException;
+    /**
+     * MEthod that downloads a TSL from a specified URI
+     * 
+     * @param uriTSL RL from where the TSL will be downloaded.
+     * @return a TSL Data Object representation.
+     * @throws TSLManagingException  In case of some error getting the information from the file.
+     */
+    ITSLObject downloadTLSbyHTTP(String uriTSL, int connectionTimeout, int readTimeout) throws TSLManagingException;
 }