Skip to content

Commit 5b7d86e

Browse files
ramsessanchezramsessanchez
committed
Remove Service and Client Exception classes
1 parent 11d0992 commit 5b7d86e

18 files changed

Lines changed: 79 additions & 270 deletions

‎spotBugsExcludeFilter.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu
4141
<Bug code="PI" />
4242
</Match>
4343
<Match>
44-
<Class name="com.microsoft.graph.exceptions.ErrorConstants$Messages" />
44+
<Class name="com.microsoft.graph.ErrorConstants$Messages" />
4545
<Bug code="PI" />
4646
</Match>
4747
<Match>

src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java renamed to src/main/java/com/microsoft/graph/ErrorConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.microsoft.graph.exceptions;
1+
package com.microsoft.graph;
22
/**
33
* Constants used for exception building
44
*/

‎src/main/java/com/microsoft/graph/content/BatchRequestContent.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.google.gson.*;
44
import com.google.gson.stream.JsonWriter;
55
import com.microsoft.graph.CoreConstants;
6-
import com.microsoft.graph.exceptions.ClientException;
7-
import com.microsoft.graph.exceptions.ErrorConstants;
6+
import com.microsoft.graph.ErrorConstants;
87
import com.microsoft.graph.models.BatchRequestStep;
98
import com.microsoft.graph.requests.IBaseClient;
9+
import com.microsoft.kiota.ApiException;
1010
import com.microsoft.kiota.Compatibility;
1111
import com.microsoft.kiota.RequestAdapter;
1212
import com.microsoft.kiota.RequestInformation;
@@ -231,8 +231,8 @@ private JsonObject getJsonRequestContent(RequestBody requestBody) {
231231
requestBody.writeTo(buffer);
232232
return JsonParser.parseString(buffer.readUtf8()).getAsJsonObject();
233233
} catch(IOException e) {
234-
ClientException clientException = new ClientException(ErrorConstants.Messages.UNABLE_TO_DESERIALIZE_CONTENT, e);
235-
throw new RuntimeException(clientException);
234+
ApiException exception = new ApiException(ErrorConstants.Messages.UNABLE_TO_DESERIALIZE_CONTENT, e);
235+
throw new RuntimeException(exception);
236236
}
237237
}
238238
private String getRawRequestContent(RequestBody requestBody) {
@@ -241,8 +241,8 @@ private String getRawRequestContent(RequestBody requestBody) {
241241
requestBody.writeTo(buffer);
242242
return buffer.readUtf8();
243243
} catch(IOException e) {
244-
ClientException clientException = new ClientException(ErrorConstants.Messages.UNABLE_TO_DESERIALIZE_CONTENT, e);
245-
throw new RuntimeException(clientException);
244+
ApiException exception = new ApiException(ErrorConstants.Messages.UNABLE_TO_DESERIALIZE_CONTENT, e);
245+
throw new RuntimeException(exception);
246246
}
247247
}
248248
private boolean containsCorrespondingRequestId(List<String> dependsOn) {

‎src/main/java/com/microsoft/graph/content/BatchRequestContentCollection.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.microsoft.graph.content;
22

33
import com.microsoft.graph.CoreConstants;
4-
import com.microsoft.graph.exceptions.ErrorConstants;
4+
import com.microsoft.graph.ErrorConstants;
55
import com.microsoft.graph.models.BatchRequestStep;
66
import com.microsoft.graph.requests.IBaseClient;
77
import com.microsoft.kiota.RequestInformation;

‎src/main/java/com/microsoft/graph/content/BatchResponseContent.java‎

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

33
import com.google.gson.*;
44
import com.microsoft.graph.CoreConstants;
5-
import com.microsoft.graph.exceptions.ErrorConstants;
5+
import com.microsoft.graph.ErrorConstants;
66
import com.microsoft.graph.requests.ResponseBodyHandler;
77
import com.microsoft.kiota.ResponseHandler;
88
import com.microsoft.kiota.serialization.Parsable;

‎src/main/java/com/microsoft/graph/exceptions/ClientException.java‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/main/java/com/microsoft/graph/exceptions/ServiceException.java‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎src/main/java/com/microsoft/graph/models/BatchRequestStep.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.microsoft.graph.models;
22

33
import com.microsoft.graph.CoreConstants;
4-
import com.microsoft.graph.exceptions.ErrorConstants;
4+
import com.microsoft.graph.ErrorConstants;
55
import com.microsoft.kiota.Compatibility;
66
import com.microsoft.kiota.http.middleware.UrlReplaceHandler;
77
import okhttp3.Request;

‎src/main/java/com/microsoft/graph/models/UploadSession.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.microsoft.graph.models;
22

3-
import com.microsoft.graph.exceptions.ErrorConstants;
3+
import com.microsoft.graph.ErrorConstants;
44
import com.microsoft.kiota.Compatibility;
55
import com.microsoft.kiota.serialization.ParseNode;
66
import com.microsoft.kiota.serialization.SerializationWriter;

‎src/main/java/com/microsoft/graph/requests/BatchRequestBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.microsoft.graph.content.BatchRequestContentCollection;
66
import com.microsoft.graph.content.BatchResponseContent;
77
import com.microsoft.graph.content.BatchResponseContentCollection;
8-
import com.microsoft.graph.exceptions.ErrorConstants;
8+
import com.microsoft.graph.ErrorConstants;
99
import com.microsoft.kiota.HttpMethod;
1010
import com.microsoft.kiota.NativeResponseHandler;
1111
import com.microsoft.kiota.RequestAdapter;

0 commit comments

Comments
 (0)