Skip to content

Commit f28b267

Browse files
author
André Behrens (serious6)
committed
renamed autodiscover.exceptions -> exception
also moved related classes to autodiscover package due to later extraction
1 parent f12e714 commit f28b267

22 files changed

Lines changed: 70 additions & 64 deletions

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Note that you should either set the URL manually or call AutodiscoverUrl, but yo
4848

4949
If the domain that the user inputs as their email address contains a CNAME that redirects the user this Exception is thrown:
5050

51-
> microsoft.exchange.webservices.data.exceptions.AutodiscoverLocalException: Autodiscover blocked a
51+
> microsoft.exchange.webservices.data.autodiscover.exception.AutodiscoverLocalException: Autodiscover blocked a
5252
potentially insecure redirection to **URL**. To allow Autodiscover to follow the redirection, use the AutodiscoverUrl(string, AutodiscoverRedirectionUrlValidationCallback) overload.<
5353

5454
When this happens, instead of failing, the user can be prompted to accept the redirection or

src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
package microsoft.exchange.webservices.data.autodiscover;
2525

26+
import microsoft.exchange.webservices.data.autodiscover.exception.AutodiscoverLocalException;
2627
import microsoft.exchange.webservices.data.exceptions.ArgumentException;
2728
import microsoft.exchange.webservices.data.enumerations.AutodiscoverEndpoints;
2829
import microsoft.exchange.webservices.data.enumerations.AutodiscoverErrorCode;
29-
import microsoft.exchange.webservices.data.exceptions.AutodiscoverLocalException;
30-
import microsoft.exchange.webservices.data.exceptions.AutodiscoverRemoteException;
30+
import microsoft.exchange.webservices.data.autodiscover.exception.AutodiscoverRemoteException;
3131
import microsoft.exchange.webservices.data.autodiscover.requests.AutodiscoverRequest;
3232
import microsoft.exchange.webservices.data.autodiscover.configuration.ConfigurationSettingsBase;
3333
import microsoft.exchange.webservices.data.enumerations.DomainSettingName;
@@ -216,7 +216,7 @@ public final class AutodiscoverService extends ExchangeServiceBase
216216
*
217217
* @param redirectionUrl the redirection url
218218
* @return Returns true.
219-
* @throws microsoft.exchange.webservices.data.exceptions.AutodiscoverLocalException the autodiscover local exception
219+
* @throws AutodiscoverLocalException the autodiscover local exception
220220
*/
221221
private boolean defaultAutodiscoverRedirectionUrlValidationCallback(
222222
String redirectionUrl) throws AutodiscoverLocalException {
@@ -336,7 +336,7 @@ TSettings getLegacyUserSettingsAtUrl(
336336
try {
337337
request.close();
338338
} catch (Exception e2) {
339-
// Ignore exceptions while closing the request.
339+
// Ignore exception while closing the request.
340340
}
341341
}
342342
}
@@ -423,7 +423,7 @@ private URI getRedirectUrl(String domainName)
423423
try {
424424
request.close();
425425
} catch (Exception e) {
426-
// Ignore exceptions when closing the request
426+
// Ignore exception when closing the request
427427
}
428428
}
429429
}

src/main/java/microsoft/exchange/webservices/data/autodiscover/configuration/ConfigurationSettingsBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package microsoft.exchange.webservices.data.autodiscover.configuration;
2525

2626
import microsoft.exchange.webservices.data.attribute.EditorBrowsable;
27-
import microsoft.exchange.webservices.data.autodiscover.exceptions.AutodiscoverError;
27+
import microsoft.exchange.webservices.data.autodiscover.exception.error.AutodiscoverError;
2828
import microsoft.exchange.webservices.data.autodiscover.responses.GetUserSettingsResponse;
2929
import microsoft.exchange.webservices.data.core.EwsXmlReader;
3030
import microsoft.exchange.webservices.data.core.XmlElementNames;

src/main/java/microsoft/exchange/webservices/data/autodiscover/configuration/outlook/OutlookConfigurationSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
package microsoft.exchange.webservices.data.autodiscover.configuration.outlook;
2525

26-
import microsoft.exchange.webservices.data.autodiscover.exceptions.UserSettingError;
26+
import microsoft.exchange.webservices.data.autodiscover.exception.error.UserSettingError;
2727
import microsoft.exchange.webservices.data.autodiscover.configuration.ConfigurationSettingsBase;
2828
import microsoft.exchange.webservices.data.autodiscover.responses.GetUserSettingsResponse;
2929
import microsoft.exchange.webservices.data.core.EwsUtilities;

src/main/java/microsoft/exchange/webservices/data/exceptions/AutodiscoverLocalException.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/AutodiscoverLocalException.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception;
25+
26+
import microsoft.exchange.webservices.data.exceptions.ServiceLocalException;
2527

2628
/**
2729
* Represents an exception that is thrown when the Autodiscover service could

src/main/java/microsoft/exchange/webservices/data/exceptions/AutodiscoverRemoteException.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/AutodiscoverRemoteException.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception;
2525

26-
import microsoft.exchange.webservices.data.autodiscover.exceptions.AutodiscoverError;
26+
import microsoft.exchange.webservices.data.autodiscover.exception.error.AutodiscoverError;
27+
import microsoft.exchange.webservices.data.exceptions.ServiceRemoteException;
2728

2829
/**
2930
* Represents an exception that is thrown when the Autodiscover service returns

src/main/java/microsoft/exchange/webservices/data/exceptions/AutodiscoverResponseException.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/AutodiscoverResponseException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception;
2525

2626
import microsoft.exchange.webservices.data.enumerations.AutodiscoverErrorCode;
27+
import microsoft.exchange.webservices.data.exceptions.ServiceRemoteException;
2728

2829
/**
2930
* Represents an exception from an autodiscover error response.

src/main/java/microsoft/exchange/webservices/data/autodiscover/exceptions/AutodiscoverError.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/error/AutodiscoverError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.autodiscover.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception.error;
2525

2626
import microsoft.exchange.webservices.data.attribute.EditorBrowsable;
2727
import microsoft.exchange.webservices.data.enumerations.EditorBrowsableState;

src/main/java/microsoft/exchange/webservices/data/autodiscover/exceptions/DomainSettingError.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/error/DomainSettingError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.autodiscover.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception.error;
2525

2626
import microsoft.exchange.webservices.data.enumerations.AutodiscoverErrorCode;
2727
import microsoft.exchange.webservices.data.core.EwsXmlReader;

src/main/java/microsoft/exchange/webservices/data/autodiscover/exceptions/UserSettingError.java renamed to src/main/java/microsoft/exchange/webservices/data/autodiscover/exception/error/UserSettingError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* THE SOFTWARE.
2222
*/
2323

24-
package microsoft.exchange.webservices.data.autodiscover.exceptions;
24+
package microsoft.exchange.webservices.data.autodiscover.exception.error;
2525

2626
import microsoft.exchange.webservices.data.enumerations.AutodiscoverErrorCode;
2727
import microsoft.exchange.webservices.data.core.EwsXmlReader;

0 commit comments

Comments
 (0)