#72: PR fixes - method naming

Author: miszobi

core/src/main/java/com/onelogin/saml2/Auth.java

@@ -81,12 +81,12 @@ public class Auth {
 	/**
 	 * The ID of the last assertion processed
 	 */
-	private String assertionId;
+	private String lastAssertionId;
 
 	/**
 	 * The NotOnOrAfter values of the last assertion processed
 	 */
-	private List<Instant> assertionNotOnOrAfter;
+	private List<Instant> lastAssertionNotOnOrAfter;
 
 	/**
      * User attributes data.
@@ -375,8 +375,8 @@ public void processResponse(String requestId) throws Exception {
 				attributes = samlResponse.getAttributes();
 				sessionIndex = samlResponse.getSessionIndex();
 				sessionExpiration = samlResponse.getSessionNotOnOrAfter();
-				assertionId = samlResponse.getAssertionId();
-				assertionNotOnOrAfter = samlResponse.getNotOnOrAfter();
+				lastAssertionId = samlResponse.getAssertionId();
+				lastAssertionNotOnOrAfter = samlResponse.getAssertionNotOnOrAfter();
 				LOGGER.debug("processResponse success --> " + samlResponseParameter);
 			} else {
 				errors.add("invalid_response");
@@ -550,15 +550,15 @@ public final DateTime getSessionExpiration()
 	/**
 	 * @return The ID of the last assertion processed
 	 */
-	public String getAssertionId() {
-		return assertionId;
+	public String getLastAssertionId() {
+		return lastAssertionId;
 	}
 
 	/**
 	 * @return The NotOnOrAfter values of the last assertion processed
 	 */
-	public List<Instant> getAssertionNotOnOrAfter() {
-		return assertionNotOnOrAfter;
+	public List<Instant> getLastAssertionNotOnOrAfter() {
+		return lastAssertionNotOnOrAfter;
 	}
 
 	/**

core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java

@@ -626,7 +626,7 @@ public String getAssertionId() throws XPathExpressionException {
 	/**
 	 * @return a list of NotOnOrAfter values from SubjectConfirmationData nodes in this Response
 	 */
-	public List<Instant> getNotOnOrAfter() throws XPathExpressionException {
+	public List<Instant> getAssertionNotOnOrAfter() throws XPathExpressionException {
 		final NodeList notOnOrAfterNodes = queryAssertion("/saml:Subject/saml:SubjectConfirmation/saml:SubjectConfirmationData");
 		final ArrayList<Instant> notOnOrAfters = new ArrayList<>();
 		for (int i = 0; i < notOnOrAfterNodes.getLength(); i++) {

core/src/test/java/com/onelogin/saml2/test/AuthTest.java

@@ -1,7 +1,6 @@
 package com.onelogin.saml2.test;
 
 
-import static com.onelogin.saml2.util.Util.UNIQUE_ID_PREFIX;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
@@ -22,9 +21,7 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.security.cert.CertificateEncodingException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
@@ -825,8 +822,8 @@ public void testGetAssertionDetails() throws Exception {
 		Auth auth = new Auth(settings, request, response);
 		auth.processResponse();
 
-		assertThat(auth.getAssertionId(), is("pfxeac87197-11cb-ec12-c181-ae739b54debe"));
-		assertThat(auth.getAssertionNotOnOrAfter(), contains(new Instant("2023-08-23T06:57:01Z")));
+		assertThat(auth.getLastAssertionId(), is("pfxeac87197-11cb-ec12-c181-ae739b54debe"));
+		assertThat(auth.getLastAssertionNotOnOrAfter(), contains(new Instant("2023-08-23T06:57:01Z")));
 	}
 
 	/**

core/src/test/java/com/onelogin/saml2/test/authn/AuthnResponseTest.java

@@ -482,7 +482,7 @@ public void testGetAssertionDetails() throws Exception {
 				new SettingsBuilder().fromFile("config/config.my.properties").build(),
 				mockRequestWithSamlResponse(Util.getFileAsString("data/responses/response1.xml.base64"))
 		);
-		final List<Instant> notOnOrAfters = samlResponse.getNotOnOrAfter();
+		final List<Instant> notOnOrAfters = samlResponse.getAssertionNotOnOrAfter();
 
 		assertEquals("pfxa46574df-b3b0-a06a-23c8-636413198772", samlResponse.getAssertionId());
 		assertThat(notOnOrAfters, contains(new Instant("2010-11-18T22:02:37Z")));
@@ -495,7 +495,7 @@ public void testGetAssertionDetails_encrypted() throws Exception {
 				new SettingsBuilder().fromFile("config/config.my.properties").build(),
 				mockRequestWithSamlResponse(Util.getFileAsString("data/responses/valid_encrypted_assertion.xml.base64"))
 		);
-		final List<Instant> notOnOrAfters = samlResponse.getNotOnOrAfter();
+		final List<Instant> notOnOrAfters = samlResponse.getAssertionNotOnOrAfter();
 
 		assertEquals("_519c2712648ee09a06d1f9a08e9e835715fea60267", samlResponse.getAssertionId());
 		assertThat(notOnOrAfters, contains(new Instant("2055-06-07T20:17:08Z")));
@@ -512,7 +512,7 @@ public void testGetAssertionDetails_multiple() throws Exception {
 				settings,
 				mockRequestWithSamlResponse(loadSignMessageAndEncode("data/responses/invalids/invalid_subjectconfirmation_multiple_issues.xml"))
 		);
-		final List<Instant> notOnOrAfters = samlResponse.getNotOnOrAfter();
+		final List<Instant> notOnOrAfters = samlResponse.getAssertionNotOnOrAfter();
 
 		assertEquals("pfx7841991c-c73f-4035-e2ee-c170c0e1d3e4", samlResponse.getAssertionId());
 		assertThat(notOnOrAfters, contains(new Instant("2120-06-17T14:53:44Z"), new Instant("2010-06-17T14:53:44Z")));