Skip to content

Commit e5a52e3

Browse files
author
André Behrens (serious6)
committed
remove Object return-parameters in -> readResponse(..) and parseResponse(..)
1 parent 0b12da6 commit e5a52e3

18 files changed

Lines changed: 146 additions & 220 deletions

‎src/main/java/microsoft/exchange/webservices/data/DelegateManagementRequestBase.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
*
2828
* @param <TResponse> The type of the response.
2929
*/
30-
abstract class DelegateManagementRequestBase
31-
<TResponse extends DelegateManagementResponse>
32-
extends SimpleServiceRequestBase {
30+
abstract class DelegateManagementRequestBase<TResponse extends DelegateManagementResponse>
31+
extends SimpleServiceRequestBase<TResponse> {
3332

3433
/**
3534
* The mailbox.
@@ -80,16 +79,12 @@ protected void writeElementsToXml(EwsServiceXmlWriter writer)
8079
protected abstract TResponse createResponse();
8180

8281
/**
83-
* Parses the response.
84-
*
85-
* @param reader the reader
86-
* @return Response object.
87-
* @throws Exception the exception
82+
* {@inheritDoc}
8883
*/
8984
@Override
90-
protected Object parseResponse(EwsServiceXmlReader reader)
85+
protected TResponse parseResponse(EwsServiceXmlReader reader)
9186
throws Exception {
92-
DelegateManagementResponse response = this.createResponse();
87+
TResponse response = this.createResponse();
9388
response.loadFromXml(reader, this.getResponseXmlElementName());
9489
return response;
9590
}

‎src/main/java/microsoft/exchange/webservices/data/DisconnectPhoneCallRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a DisconnectPhoneCall request.
2727
*/
28-
final class DisconnectPhoneCallRequest extends SimpleServiceRequestBase {
28+
final class DisconnectPhoneCallRequest extends SimpleServiceRequestBase<ServiceResponse> {
2929

3030
/**
3131
* The id.
@@ -77,14 +77,10 @@ protected String getResponseXmlElementName() {
7777
}
7878

7979
/**
80-
* Parses the response.
81-
*
82-
* @param reader the reader
83-
* @return Response object.
84-
* @throws Exception the exception
80+
* {@inheritDoc}
8581
*/
8682
@Override
87-
protected Object parseResponse(EwsServiceXmlReader reader)
83+
protected ServiceResponse parseResponse(EwsServiceXmlReader reader)
8884
throws Exception {
8985
ServiceResponse serviceResponse = new ServiceResponse();
9086
serviceResponse.loadFromXml(reader,

‎src/main/java/microsoft/exchange/webservices/data/FindConversationRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a request to a Find Conversation operation
2727
*/
28-
final class FindConversationRequest extends SimpleServiceRequestBase {
28+
final class FindConversationRequest extends SimpleServiceRequestBase<FindConversationResponse> {
2929

3030

3131
private ConversationIndexedItemView view;
@@ -132,14 +132,10 @@ protected void writeElementsToXml(EwsServiceXmlWriter writer)
132132
}
133133

134134
/**
135-
* Parses the response.
136-
*
137-
* @param reader The reader.
138-
* @return Response object.
139-
* @throws Exception
135+
* {@inheritDoc}
140136
*/
141137
@Override
142-
protected Object parseResponse(EwsServiceXmlReader reader)
138+
protected FindConversationResponse parseResponse(EwsServiceXmlReader reader)
143139
throws Exception {
144140
FindConversationResponse response = new FindConversationResponse();
145141
response.loadFromXml(reader,

‎src/main/java/microsoft/exchange/webservices/data/GetInboxRulesRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* Represents a GetInboxRules request.
2929
*/
30-
final class GetInboxRulesRequest extends SimpleServiceRequestBase {
30+
final class GetInboxRulesRequest extends SimpleServiceRequestBase<GetInboxRulesResponse> {
3131

3232
/**
3333
* The smtp address of the mailbox from which to get the inbox rules.
@@ -101,14 +101,10 @@ protected String getResponseXmlElementName() {
101101
}
102102

103103
/**
104-
* Parses the response.
105-
*
106-
* @param reader The reader.
107-
* @return Response object.
108-
* @throws Exception
104+
* {@inheritDoc}
109105
*/
110106
@Override
111-
protected Object parseResponse(EwsServiceXmlReader reader)
107+
protected GetInboxRulesResponse parseResponse(EwsServiceXmlReader reader)
112108
throws Exception {
113109
GetInboxRulesResponse response = new GetInboxRulesResponse();
114110
response.loadFromXml(reader, XmlElementNames.GetInboxRulesResponse);

‎src/main/java/microsoft/exchange/webservices/data/GetPasswordExpirationDateRequest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import javax.xml.stream.XMLStreamException;
2626

27-
public final class GetPasswordExpirationDateRequest extends SimpleServiceRequestBase {
27+
public final class GetPasswordExpirationDateRequest extends SimpleServiceRequestBase<GetPasswordExpirationDateResponse> {
2828

2929
@Override
3030
protected ExchangeVersion getMinimumRequiredServerVersion() {
@@ -64,15 +64,13 @@ protected void writeElementsToXml(EwsServiceXmlWriter writer)
6464
}
6565

6666
/**
67-
* Parses the response
68-
*
69-
* @return GEtPasswordExpirationDateResponse
67+
* {@inheritDoc}
7068
*/
71-
protected Object parseResponse(EwsServiceXmlReader reader) throws Exception {
69+
@Override
70+
protected GetPasswordExpirationDateResponse parseResponse(EwsServiceXmlReader reader) throws Exception {
7271
GetPasswordExpirationDateResponse response = new GetPasswordExpirationDateResponse();
7372
response.loadFromXml(reader, XmlElementNames.GetPasswordExpirationDateResponse);
7473
return response;
75-
7674
}
7775

7876
/**

‎src/main/java/microsoft/exchange/webservices/data/GetPhoneCallRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a GetPhoneCall request.
2727
*/
28-
final class GetPhoneCallRequest extends SimpleServiceRequestBase {
28+
final class GetPhoneCallRequest extends SimpleServiceRequestBase<GetPhoneCallResponse> {
2929

3030
/**
3131
* The id.
@@ -77,14 +77,10 @@ protected String getResponseXmlElementName() {
7777
}
7878

7979
/**
80-
* Parses the response.
81-
*
82-
* @param reader the reader
83-
* @return Response object.
84-
* @throws Exception the exception
80+
* {@inheritDoc}
8581
*/
8682
@Override
87-
protected Object parseResponse(EwsServiceXmlReader reader)
83+
protected GetPhoneCallResponse parseResponse(EwsServiceXmlReader reader)
8884
throws Exception {
8985
GetPhoneCallResponse response = new GetPhoneCallResponse(getService());
9086
response.loadFromXml(reader, XmlElementNames.GetPhoneCallResponse);

‎src/main/java/microsoft/exchange/webservices/data/GetRoomListsRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a GetRoomList request.
2727
*/
28-
final class GetRoomListsRequest extends SimpleServiceRequestBase {
28+
final class GetRoomListsRequest extends SimpleServiceRequestBase<GetRoomListsResponse> {
2929

3030
/**
3131
* Initializes a new instance of the class.
@@ -69,14 +69,10 @@ protected String getResponseXmlElementName() {
6969
}
7070

7171
/**
72-
* Parses the response.
73-
*
74-
* @param reader the reader
75-
* @return Response object.
76-
* @throws Exception the exception
72+
* {@inheritDoc}
7773
*/
7874
@Override
79-
protected Object parseResponse(EwsServiceXmlReader reader)
75+
protected GetRoomListsResponse parseResponse(EwsServiceXmlReader reader)
8076
throws Exception {
8177
GetRoomListsResponse response = new GetRoomListsResponse();
8278
response.loadFromXml(reader, XmlElementNames.GetRoomListsResponse);

‎src/main/java/microsoft/exchange/webservices/data/GetRoomsRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a GetRooms request.
2727
*/
28-
final class GetRoomsRequest extends SimpleServiceRequestBase {
28+
final class GetRoomsRequest extends SimpleServiceRequestBase<GetRoomsResponse> {
2929

3030
/**
3131
* Represents a GetRooms request.
@@ -72,14 +72,10 @@ protected String getResponseXmlElementName() {
7272
}
7373

7474
/**
75-
* Parses the response.
76-
*
77-
* @param reader the reader
78-
* @return Response object.
79-
* @throws Exception the exception
75+
* {@inheritDoc}
8076
*/
8177
@Override
82-
protected Object parseResponse(EwsServiceXmlReader reader)
78+
protected GetRoomsResponse parseResponse(EwsServiceXmlReader reader)
8379
throws Exception {
8480
GetRoomsResponse response = new GetRoomsResponse();
8581
response.loadFromXml(reader, XmlElementNames.GetRoomsResponse);

‎src/main/java/microsoft/exchange/webservices/data/GetStreamingEventsRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* Defines the GetStreamingEventsRequest class.
2929
*/
30-
class GetStreamingEventsRequest extends HangingServiceRequestBase {
30+
class GetStreamingEventsRequest extends HangingServiceRequestBase<GetStreamingEventsResponse> {
3131

3232
protected final static int HeartbeatFrequencyDefault = 45000; ////45s in ms
3333
private static int heartbeatFrequency = HeartbeatFrequencyDefault;
@@ -113,14 +113,10 @@ protected ExchangeVersion getMinimumRequiredServerVersion() {
113113
}
114114

115115
/**
116-
* Parses the response.
117-
*
118-
* @param reader The reader
119-
* @return response
120-
* @throws Exception
116+
* {@inheritDoc}
121117
*/
122118
@Override
123-
protected Object parseResponse(EwsServiceXmlReader reader)
119+
protected GetStreamingEventsResponse parseResponse(EwsServiceXmlReader reader)
124120
throws Exception {
125121
reader.readStartElement(XmlNamespace.Messages,
126122
XmlElementNames.ResponseMessages);

‎src/main/java/microsoft/exchange/webservices/data/GetUserAvailabilityRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Represents a GetUserAvailability request.
2727
*/
28-
final class GetUserAvailabilityRequest extends SimpleServiceRequestBase {
28+
final class GetUserAvailabilityRequest extends SimpleServiceRequestBase<GetUserAvailabilityResults> {
2929

3030
/**
3131
* The attendees.
@@ -147,14 +147,10 @@ protected String getResponseXmlElementName() {
147147
}
148148

149149
/**
150-
* Parses the response.
151-
*
152-
* @param reader the reader
153-
* @return Response object.
154-
* @throws Exception the exception
150+
* {@inheritDoc}
155151
*/
156152
@Override
157-
protected Object parseResponse(EwsServiceXmlReader reader)
153+
protected GetUserAvailabilityResults parseResponse(EwsServiceXmlReader reader)
158154
throws Exception {
159155
GetUserAvailabilityResults serviceResponse =
160156
new GetUserAvailabilityResults();

0 commit comments

Comments
 (0)