You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/11/16 04:38:19 UTC
[openmeetings] branch 4.0.x updated: no jira: javadoc errors are
fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new ffcfee9 no jira: javadoc errors are fixed
ffcfee9 is described below
commit ffcfee94b6405f4e02bc2b7b52e50ecdcd920f07
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Nov 16 11:37:33 2018 +0700
no jira: javadoc errors are fixed
---
.../service/calendar/caldav/AppointmentManager.java | 11 +++++++++--
.../service/calendar/caldav/methods/SyncMethod.java | 7 +++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index ad5bebf..8519ab6 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -68,7 +68,7 @@ import net.fortuna.ical4j.util.MapTimeZoneCache;
/**
* Class which does syncing and provides respective API's required for performing CalDAV Operations.
- * @author Ankush Mishra <an...@gmail.com>
+ * @author Ankush Mishra (ankushmishra9@gmail.com)
*/
@Component
public class AppointmentManager {
@@ -78,7 +78,6 @@ public class AppointmentManager {
private static final int IDLE_CONNECTION_TIMEOUT = 30; // 30 seconds
private static final int MAX_HOST_CONNECTIONS = 6; // Number of simultaneous connections to one host
private static final int MAX_TOTAL_CONNECTIONS = 10; // Max Connections, at one time in memory.
- private static final int CONNECTION_MANAGER_TIMEOUT = 1000; // Waits for 1 sec if no empty connection exists
private PoolingHttpClientConnectionManager connmanager = null;
@@ -140,6 +139,7 @@ public class AppointmentManager {
* Tests if the Calendar's URL can be accessed, or not.
*
* @param client Client which makes the connection.
+ * @param context http context
* @param calendar Calendar whose URL is to be accessed.
* @return Returns true for HTTP Status 200, or 204, else false.
*/
@@ -173,6 +173,7 @@ public class AppointmentManager {
* Create or Update calendar on the database.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param calendar - calendar to be created
* @return <code>true</code> if calendar was created/updated
*/
@@ -223,6 +224,7 @@ public class AppointmentManager {
* Function which when called performs syncing based on the type of Syncing detected.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param calendar Calendar who's sync has to take place
*/
public void syncItem(HttpClient client, HttpClientContext context, OmCalendar calendar) {
@@ -254,6 +256,7 @@ public class AppointmentManager {
* Syncs all the calendars currrently present on the DB.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param userId - id of the user
*/
public void syncItems(HttpClient client, HttpClientContext context, Long userId) {
@@ -267,6 +270,7 @@ public class AppointmentManager {
* Function which finds all the calendars of the Principal URL of the calendar
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param calendar - calendar to get principal URL from
* @return - <code>true</code> in case calendar was discovered successfully
*/
@@ -457,6 +461,7 @@ public class AppointmentManager {
* Function to initialize the Calendar on the type of syncing and whether it can be used or not.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param calendar - calendar to be inited
* @return <code>true</code> in case calendar was inited
*/
@@ -526,6 +531,7 @@ public class AppointmentManager {
* Performs modification alongside of creation new events on the server.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param appointment Appointment to create/update.
* @return <code>true</code> in case item was updated
*/
@@ -558,6 +564,7 @@ public class AppointmentManager {
* i.e. only if the Event hasn't changed on the Server.
*
* @param client - {@link HttpClient} to discover calendar
+ * @param context http context
* @param appointment Appointment to Delete
* @return <code>true</code> in case item was deleted
*/
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
index c70be85..dfed8c1 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
@@ -103,21 +103,24 @@ public class SyncMethod extends BaseDavRequest {
}
public String getResponseSynctoken(HttpResponse response) {
- if (!processedResponse)
+ if (!processedResponse) {
processResponseBody(response);
+ }
return synctoken;
}
/**
* Adapted from DavMethodBase to handle MultiStatus responses.
*
+ * @param response {@link HttpResponse} to be converted to {@link MultiStatus}
* @return MultiStatus response
* @throws DavException if the response body could not be parsed
*/
@Override
public MultiStatus getResponseBodyAsMultiStatus(HttpResponse response) throws DavException {
- if (!processedResponse)
+ if (!processedResponse) {
processResponseBody(response);
+ }
if (multiStatus != null) {
return multiStatus;