Move message factories to their own package

mauromol · mauromol · commit abd632656b15 · 2021-08-31T16:51:15.000+02:00
diff --git a/toolkit/src/main/java/com/onelogin/saml2/Auth.java b/toolkit/src/main/java/com/onelogin/saml2/Auth.java
@@ -26,6 +26,8 @@
 import com.onelogin.saml2.authn.AuthnRequestParams;
 import com.onelogin.saml2.authn.SamlResponse;
 import com.onelogin.saml2.exception.SettingsException;
+import com.onelogin.saml2.factory.SamlOutgoingMessageFactory;
+import com.onelogin.saml2.factory.SamlReceivedMessageFactory;
 import com.onelogin.saml2.exception.Error;
 import com.onelogin.saml2.http.HttpRequest;
 import com.onelogin.saml2.logout.LogoutRequest;
diff --git a/toolkit/src/main/java/com/onelogin/saml2/factory/SamlOutgoingMessageFactory.java b/toolkit/src/main/java/com/onelogin/saml2/factory/SamlOutgoingMessageFactory.java
@@ -1,4 +1,4 @@
-package com.onelogin.saml2;
+package com.onelogin.saml2.factory;
 
 import com.onelogin.saml2.settings.Saml2Settings;
 
diff --git a/toolkit/src/main/java/com/onelogin/saml2/factory/SamlReceivedMessageFactory.java b/toolkit/src/main/java/com/onelogin/saml2/factory/SamlReceivedMessageFactory.java
@@ -1,4 +1,4 @@
-package com.onelogin.saml2;
+package com.onelogin.saml2.factory;
 
 import com.onelogin.saml2.http.HttpRequest;
 import com.onelogin.saml2.settings.Saml2Settings;
diff --git a/toolkit/src/test/java/com/onelogin/saml2/test/AuthTest.java b/toolkit/src/test/java/com/onelogin/saml2/test/AuthTest.java
@@ -2237,7 +2237,7 @@ private static class FactoryInvokedException extends RuntimeException {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setAuthnRequestFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setAuthnRequestFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testAuthnRequestFactory() throws Exception {
@@ -2266,7 +2266,7 @@ public AuthnRequestEx(Saml2Settings sett, AuthnRequestParams par) {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setSamlResponseFactory(com.onelogin.saml2.SamlReceivedMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setSamlResponseFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testSamlResponseFactory() throws Exception {
@@ -2298,7 +2298,7 @@ public SamlResponseEx(Saml2Settings sett, HttpRequest req) throws Exception {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setOutgoingLogoutRequestFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setOutgoingLogoutRequestFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testOutgoingLogoutRequestFactory() throws Exception {
@@ -2329,7 +2329,7 @@ public LogoutRequestEx(Saml2Settings sett, LogoutRequestParams par) {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setReceivedLogoutRequestFactory(com.onelogin.saml2.SamlReceivedMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setReceivedLogoutRequestFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testReceivedLogoutRequestFactory() throws Exception {
@@ -2364,7 +2364,7 @@ public LogoutRequestEx(Saml2Settings sett, HttpRequest req) {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setOutgoingLogoutResponseFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setOutgoingLogoutResponseFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testOutgoingLogoutResponseFactory() throws Exception {
@@ -2399,7 +2399,7 @@ public LogoutResponseEx(Saml2Settings sett, HttpRequest req) {
 	 *
 	 * @throws Exception 
 	 *
-	 * @see com.onelogin.saml2.Auth#setReceivedLogoutResponseFactory(com.onelogin.saml2.SamlReceivedMessageFactory)
+	 * @see com.onelogin.saml2.Auth#setReceivedLogoutResponseFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)
 	 */
 	@Test(expected = FactoryInvokedException.class)
 	public void testReceivedLogoutResponseFactory() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.onelogin.saml2;`
	`1`	`+package com.onelogin.saml2.factory;`
`2`	`2`
`3`	`3`	`import com.onelogin.saml2.settings.Saml2Settings;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -2237,7 +2237,7 @@ private static class FactoryInvokedException extends RuntimeException {`
`2237`	`2237`	`*`
`2238`	`2238`	`* @throws Exception`
`2239`	`2239`	`*`
`2240`		`- * @see com.onelogin.saml2.Auth#setAuthnRequestFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)`
	`2240`	`+ * @see com.onelogin.saml2.Auth#setAuthnRequestFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)`
`2241`	`2241`	`*/`
`2242`	`2242`	`@Test(expected = FactoryInvokedException.class)`
`2243`	`2243`	`public void testAuthnRequestFactory() throws Exception {`
`@@ -2266,7 +2266,7 @@ public AuthnRequestEx(Saml2Settings sett, AuthnRequestParams par) {`
`2266`	`2266`	`*`
`2267`	`2267`	`* @throws Exception`
`2268`	`2268`	`*`
`2269`		`- * @see com.onelogin.saml2.Auth#setSamlResponseFactory(com.onelogin.saml2.SamlReceivedMessageFactory)`
	`2269`	`+ * @see com.onelogin.saml2.Auth#setSamlResponseFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)`
`2270`	`2270`	`*/`
`2271`	`2271`	`@Test(expected = FactoryInvokedException.class)`
`2272`	`2272`	`public void testSamlResponseFactory() throws Exception {`
`@@ -2298,7 +2298,7 @@ public SamlResponseEx(Saml2Settings sett, HttpRequest req) throws Exception {`
`2298`	`2298`	`*`
`2299`	`2299`	`* @throws Exception`
`2300`	`2300`	`*`
`2301`		`- * @see com.onelogin.saml2.Auth#setOutgoingLogoutRequestFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)`
	`2301`	`+ * @see com.onelogin.saml2.Auth#setOutgoingLogoutRequestFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)`
`2302`	`2302`	`*/`
`2303`	`2303`	`@Test(expected = FactoryInvokedException.class)`
`2304`	`2304`	`public void testOutgoingLogoutRequestFactory() throws Exception {`
`@@ -2329,7 +2329,7 @@ public LogoutRequestEx(Saml2Settings sett, LogoutRequestParams par) {`
`2329`	`2329`	`*`
`2330`	`2330`	`* @throws Exception`
`2331`	`2331`	`*`
`2332`		`- * @see com.onelogin.saml2.Auth#setReceivedLogoutRequestFactory(com.onelogin.saml2.SamlReceivedMessageFactory)`
	`2332`	`+ * @see com.onelogin.saml2.Auth#setReceivedLogoutRequestFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)`
`2333`	`2333`	`*/`
`2334`	`2334`	`@Test(expected = FactoryInvokedException.class)`
`2335`	`2335`	`public void testReceivedLogoutRequestFactory() throws Exception {`
`@@ -2364,7 +2364,7 @@ public LogoutRequestEx(Saml2Settings sett, HttpRequest req) {`
`2364`	`2364`	`*`
`2365`	`2365`	`* @throws Exception`
`2366`	`2366`	`*`
`2367`		`- * @see com.onelogin.saml2.Auth#setOutgoingLogoutResponseFactory(com.onelogin.saml2.SamlOutgoingMessageFactory)`
	`2367`	`+ * @see com.onelogin.saml2.Auth#setOutgoingLogoutResponseFactory(com.onelogin.saml2.factory.SamlOutgoingMessageFactory)`
`2368`	`2368`	`*/`
`2369`	`2369`	`@Test(expected = FactoryInvokedException.class)`
`2370`	`2370`	`public void testOutgoingLogoutResponseFactory() throws Exception {`
`@@ -2399,7 +2399,7 @@ public LogoutResponseEx(Saml2Settings sett, HttpRequest req) {`
`2399`	`2399`	`*`
`2400`	`2400`	`* @throws Exception`
`2401`	`2401`	`*`
`2402`		`- * @see com.onelogin.saml2.Auth#setReceivedLogoutResponseFactory(com.onelogin.saml2.SamlReceivedMessageFactory)`
	`2402`	`+ * @see com.onelogin.saml2.Auth#setReceivedLogoutResponseFactory(com.onelogin.saml2.factory.SamlReceivedMessageFactory)`
`2403`	`2403`	`*/`
`2404`	`2404`	`@Test(expected = FactoryInvokedException.class)`
`2405`	`2405`	`public void testReceivedLogoutResponseFactory() throws Exception {`