From ca63c924ecc4abcde6ffa0d308aba399d3c3a36a Mon Sep 17 00:00:00 2001
From: Moritzjenny <moritzjenny@hotmail.com>
Date: Wed, 15 Jul 2020 14:22:30 +0200
Subject: [PATCH] no-jira: repackage doceditor webservice
---
...ervice.java => BigBlueButtonStatsWebService.java} | 2 +-
.../system}/DocEditorSessionWebService.java | 3 ++-
.../system}/DocEditorWebService.java | 3 +--
.../olat/restapi/system/MonitoringWebService.java | 12 +++++++++---
.../system/vo}/DocEditorStatisticsVO.java | 2 +-
.../org/olat/restapi/DocEditorWebServiceTest.java | 4 ++--
6 files changed, 16 insertions(+), 10 deletions(-)
rename src/main/java/org/olat/restapi/system/{BigBlueButtonWebService.java => BigBlueButtonStatsWebService.java} (98%)
rename src/main/java/org/olat/{core/commons/services/doceditor/restapi => restapi/system}/DocEditorSessionWebService.java (96%)
rename src/main/java/org/olat/{core/commons/services/doceditor/restapi => restapi/system}/DocEditorWebService.java (94%)
rename src/main/java/org/olat/{core/commons/services/doceditor/restapi => restapi/system/vo}/DocEditorStatisticsVO.java (97%)
diff --git a/src/main/java/org/olat/restapi/system/BigBlueButtonWebService.java b/src/main/java/org/olat/restapi/system/BigBlueButtonStatsWebService.java
similarity index 98%
rename from src/main/java/org/olat/restapi/system/BigBlueButtonWebService.java
rename to src/main/java/org/olat/restapi/system/BigBlueButtonStatsWebService.java
index 68d185ab3e8..70e22fb76a6 100644
--- a/src/main/java/org/olat/restapi/system/BigBlueButtonWebService.java
+++ b/src/main/java/org/olat/restapi/system/BigBlueButtonStatsWebService.java
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
* @author mjenny, moritz.jenny@frentix.com, http://www.frentix.com
*/
-public class BigBlueButtonWebService {
+public class BigBlueButtonStatsWebService {
/**
* Return the statistics about Big Blue Button
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorSessionWebService.java b/src/main/java/org/olat/restapi/system/DocEditorSessionWebService.java
similarity index 96%
rename from src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorSessionWebService.java
rename to src/main/java/org/olat/restapi/system/DocEditorSessionWebService.java
index da582797eec..2905cbfefbd 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorSessionWebService.java
+++ b/src/main/java/org/olat/restapi/system/DocEditorSessionWebService.java
@@ -18,7 +18,7 @@
* <p>
*/
-package org.olat.core.commons.services.doceditor.restapi;
+package org.olat.restapi.system;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.doceditor.DocEditor.Mode;
import org.olat.core.commons.services.doceditor.wopi.WopiService;
+import org.olat.restapi.system.vo.DocEditorStatisticsVO;
import org.springframework.stereotype.Component;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorWebService.java b/src/main/java/org/olat/restapi/system/DocEditorWebService.java
similarity index 94%
rename from src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorWebService.java
rename to src/main/java/org/olat/restapi/system/DocEditorWebService.java
index edaf8a9c7f4..c708e66176c 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorWebService.java
+++ b/src/main/java/org/olat/restapi/system/DocEditorWebService.java
@@ -18,7 +18,7 @@
* <p>
*/
-package org.olat.core.commons.services.doceditor.restapi;
+package org.olat.restapi.system;
import javax.ws.rs.Path;
@@ -35,7 +35,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
*
*/
@Tag(name = "Document Editor")
-@Path("doceditor")
@Component
public class DocEditorWebService {
diff --git a/src/main/java/org/olat/restapi/system/MonitoringWebService.java b/src/main/java/org/olat/restapi/system/MonitoringWebService.java
index f8fff34fad9..23066b2ec76 100644
--- a/src/main/java/org/olat/restapi/system/MonitoringWebService.java
+++ b/src/main/java/org/olat/restapi/system/MonitoringWebService.java
@@ -52,7 +52,8 @@ public class MonitoringWebService {
private static final ThreadsWebService threadsWebService = new ThreadsWebService();
private static final OpenOLATStatisticsWebService ooStatsWebService = new OpenOLATStatisticsWebService();
private static final VFSStatsWebService vfsStatsWebService = new VFSStatsWebService();
- private static final BigBlueButtonWebService bigBlueButtonWebService = new BigBlueButtonWebService();
+ private static final BigBlueButtonStatsWebService bigBlueButtonStatsWebService = new BigBlueButtonStatsWebService();
+ private static final DocEditorWebService docEditorWebService = new DocEditorWebService();
public MonitoringWebService() {
//make Spring happy
@@ -94,8 +95,13 @@ public class MonitoringWebService {
}
@Path("bigbluebutton")
- public BigBlueButtonWebService getBigBlueButtonStatistics() {
- return bigBlueButtonWebService;
+ public BigBlueButtonStatsWebService getBigBlueButtonStatistics() {
+ return bigBlueButtonStatsWebService;
+ }
+
+ @Path("doceditor")
+ public DocEditorWebService getDocEditorWebService() {
+ return docEditorWebService;
}
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorStatisticsVO.java b/src/main/java/org/olat/restapi/system/vo/DocEditorStatisticsVO.java
similarity index 97%
rename from src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorStatisticsVO.java
rename to src/main/java/org/olat/restapi/system/vo/DocEditorStatisticsVO.java
index 0abd75f7cdf..ef623e46547 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/restapi/DocEditorStatisticsVO.java
+++ b/src/main/java/org/olat/restapi/system/vo/DocEditorStatisticsVO.java
@@ -19,7 +19,7 @@
*/
-package org.olat.core.commons.services.doceditor.restapi;
+package org.olat.restapi.system.vo;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/test/java/org/olat/restapi/DocEditorWebServiceTest.java b/src/test/java/org/olat/restapi/DocEditorWebServiceTest.java
index e8e5183bf22..5f84ac927e6 100644
--- a/src/test/java/org/olat/restapi/DocEditorWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/DocEditorWebServiceTest.java
@@ -37,12 +37,12 @@ import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.services.doceditor.DocEditor.Mode;
import org.olat.core.commons.services.doceditor.DocEditorSecurityCallback;
import org.olat.core.commons.services.doceditor.DocEditorSecurityCallbackBuilder;
-import org.olat.core.commons.services.doceditor.restapi.DocEditorStatisticsVO;
import org.olat.core.commons.services.doceditor.wopi.Access;
import org.olat.core.commons.services.doceditor.wopi.WopiService;
import org.olat.core.commons.services.vfs.VFSMetadata;
import org.olat.core.commons.services.vfs.manager.VFSMetadataDAO;
import org.olat.core.id.Identity;
+import org.olat.restapi.system.vo.DocEditorStatisticsVO;
import org.olat.test.JunitTestHelper;
import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
@@ -85,7 +85,7 @@ public class DocEditorWebServiceTest extends OlatRestTestCase {
Assert.assertNotNull(access1);
Assert.assertNotNull(access2);
- URI request = UriBuilder.fromUri(getContextURI()).path("doceditor").path("sessions").path(randomAppName).build();
+ URI request = UriBuilder.fromUri(getContextURI()).path("system").path("monitoring").path("doceditor").path("sessions").path(randomAppName).build();
HttpGet method = conn.createGet(request, MediaType.APPLICATION_JSON, true);
HttpResponse response = conn.execute(method);
Assert.assertEquals(200, response.getStatusLine().getStatusCode());
--
GitLab