Skip to content

Commit 23c12fb

Browse files
committed
Revert "Add protected getter for settings to ease extension"
This reverts commit 91fb559.
1 parent 75acb19 commit 23c12fb

File tree

5 files changed

+5
-56
lines changed

5 files changed

+5
-56
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,4 @@ public String getId()
288288
public Calendar getIssueInstant() {
289289
return issueInstant == null? null: (Calendar) issueInstant.clone();
290290
}
291-
292-
/**
293-
* Returns the SAML settings specified at construction time.
294-
*
295-
* @return the SAML settings
296-
*/
297-
protected Saml2Settings getSettings() {
298-
return settings;
299-
}
300291
}

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
*/
4242
public class SamlResponse {
4343
/**
44-
* Private property to construct a logger for this class.
45-
*/
44+
* Private property to construct a logger for this class.
45+
*/
4646
private static final Logger LOGGER = LoggerFactory.getLogger(SamlResponse.class);
4747

4848
/**
49-
* Settings data.
50-
*/
49+
* Settings data.
50+
*/
5151
private final Saml2Settings settings;
5252

5353
/**
@@ -1322,13 +1322,4 @@ public Calendar getResponseIssueInstant() throws ValidationError {
13221322
}
13231323
return result;
13241324
}
1325-
1326-
/**
1327-
* Returns the SAML settings specified at construction time.
1328-
*
1329-
* @return the SAML settings
1330-
*/
1331-
protected Saml2Settings getSettings() {
1332-
return settings;
1333-
}
13341325
}

core/src/main/java/com/onelogin/saml2/logout/LogoutRequest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -829,13 +829,4 @@ public String getId()
829829
public Calendar getIssueInstant() {
830830
return issueInstant == null? null: (Calendar) issueInstant.clone();
831831
}
832-
833-
/**
834-
* Returns the SAML settings specified at construction time.
835-
*
836-
* @return the SAML settings
837-
*/
838-
protected Saml2Settings getSettings() {
839-
return settings;
840-
}
841832
}

core/src/main/java/com/onelogin/saml2/logout/LogoutResponse.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,4 @@ public Calendar getIssueInstant() throws ValidationError {
534534
} else
535535
return issueInstant == null? null: (Calendar) issueInstant.clone();
536536
}
537-
538-
/**
539-
* Returns the SAML settings specified at construction time.
540-
*
541-
* @return the SAML settings
542-
*/
543-
protected Saml2Settings getSettings() {
544-
return settings;
545-
}
546537
}

core/src/main/java/com/onelogin/saml2/settings/Metadata.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ public class Metadata {
6262
*/
6363
private final Integer cacheDuration;
6464

65-
/**
66-
* Settings data.
67-
*/
68-
private final Saml2Settings settings;
69-
7065
/**
7166
* Constructs the Metadata object.
7267
*
@@ -77,7 +72,6 @@ public class Metadata {
7772
* @throws CertificateEncodingException
7873
*/
7974
public Metadata(Saml2Settings settings, Calendar validUntilTime, Integer cacheDuration, AttributeConsumingService attributeConsumingService) throws CertificateEncodingException {
80-
this.settings = settings;
8175
this.validUntilTime = validUntilTime;
8276
this.attributeConsumingService = attributeConsumingService;
8377
this.cacheDuration = cacheDuration;
@@ -108,7 +102,7 @@ public Metadata(Saml2Settings settings, Calendar validUntilTime, Integer cacheDu
108102
* @throws CertificateEncodingException
109103
*/
110104
public Metadata(Saml2Settings settings) throws CertificateEncodingException {
111-
this.settings = settings;
105+
112106
this.validUntilTime = Calendar.getInstance();
113107
this.validUntilTime.add(Calendar.DAY_OF_YEAR, N_DAYS_VALID_UNTIL);
114108

@@ -413,13 +407,4 @@ public static String signMetadata(String metadata, PrivateKey key, X509Certifica
413407
LOGGER.debug("Signed metadata --> " + signedMetadata);
414408
return signedMetadata;
415409
}
416-
417-
/**
418-
* Returns the SAML settings specified at construction time.
419-
*
420-
* @return the SAML settings
421-
*/
422-
protected Saml2Settings getSettings() {
423-
return settings;
424-
}
425410
}

0 commit comments

Comments
 (0)