OO-4939: Better variable names

src/main/java/org/olat/core/commons/services/doceditor/office365/Office365Editor.java

@@ -92,7 +92,7 @@ public class Office365Editor implements DocEditor {
 
 	@Override
 	public String getDocumentBaseUrl() {
-		return office365Module.getDocumentBaseUrl();
+		return office365Module.getHostEditBaseUrl();
 	}
 
 	@Override

src/main/java/org/olat/core/commons/services/doceditor/office365/Office365Module.java

@@ -39,7 +39,7 @@ public class Office365Module extends AbstractSpringModule implements ConfigOnOff
 	private static final String OFFICE365_ENABLED = "office365.enabled";
 	private static final String OFFICE365_BASE_URL = "office365.baseUrl";
 	private static final String OFFICE365_DATA_TRANSER_CONFIRMATION_ENABLED = "office365.data.transfer.confirmation.enabled";
-	private static final String OFFICE365_DOCUMENT_BASE_URL = "office365.document.baseUrl";
+	private static final String OFFICE365_HOST_EDIT_BASE_URL = "office365.host.edit.baseUrl";
 	private static final String OFFICE365_USAGE_AUTHORS = "office365.usage.authors";
 	private static final String OFFICE365_USAGE_COACHES = "office365.usage.coaches";
 	private static final String OFFICE365_USAGE_MANAGERS = "office365.usage.managers";
@@ -50,8 +50,8 @@ public class Office365Module extends AbstractSpringModule implements ConfigOnOff
 	private String baseUrl;
 	@Value("${office365.data.transfer.confirmation.enabled:false}")
 	private boolean dataTransferConfirmationEnabled;
-	@Value("${office365.document.baseUrl}")
-	private String documentBaseUrl;
+	@Value("${office365.host.edit.baseUrl}")
+	private String hostEditBaseUrl;
 	@Value("${office365.usage.restricted.authors:false}")
 	private boolean usageRestrictedToAuthors;
 	@Value("${office365.usage.restricted.coaches:false}")
@@ -90,7 +90,7 @@ public class Office365Module extends AbstractSpringModule implements ConfigOnOff
 			dataTransferConfirmationEnabled = "true".equals(dataTransferConfirmationEnabledObj);
 		}
 		
-		documentBaseUrl = getStringPropertyValue(OFFICE365_DOCUMENT_BASE_URL, documentBaseUrl);
+		hostEditBaseUrl = getStringPropertyValue(OFFICE365_HOST_EDIT_BASE_URL, hostEditBaseUrl);
 		
 		String usageRestrictedToAuthorsObj = getStringPropertyValue(OFFICE365_USAGE_AUTHORS, true);
 		if(StringHelper.containsNonWhitespace(usageRestrictedToAuthorsObj)) {
@@ -136,13 +136,13 @@ public class Office365Module extends AbstractSpringModule implements ConfigOnOff
 		setStringProperty(OFFICE365_DATA_TRANSER_CONFIRMATION_ENABLED, Boolean.toString(dataTransferConfirmationEnabled), true);
 	}
 	
-	public String getDocumentBaseUrl() {
-		return documentBaseUrl;
+	public String getHostEditBaseUrl() {
+		return hostEditBaseUrl;
 	}
 
-	public void setDocumentBaseUrl(String documentBaseUrl) {
-		this.documentBaseUrl = documentBaseUrl;
-		setStringProperty(OFFICE365_DOCUMENT_BASE_URL, documentBaseUrl, true);
+	public void setHostEditBaseUrl(String hostEditBaseUrl) {
+		this.hostEditBaseUrl = hostEditBaseUrl;
+		setStringProperty(OFFICE365_HOST_EDIT_BASE_URL, hostEditBaseUrl, true);
 	}
 
 	public boolean isUsageRestricted() {

src/main/java/org/olat/core/commons/services/doceditor/office365/ui/Office365AdminController.java

@@ -61,7 +61,7 @@ public class Office365AdminController extends FormBasicController {
 	
 	private MultipleSelectionElement enabledEl;
 	private TextElement baseUrlEl;
-	private TextElement documentBaseUrlEl;
+	private TextElement hostEditBaseUrlEl;
 	private FormLink refreshDiscoveryLink;
 	private MultipleSelectionElement dataTransferConfirmationEnabledEl;
 	private MultipleSelectionElement usageRolesEl;
@@ -88,9 +88,9 @@ public class Office365AdminController extends FormBasicController {
 		baseUrlEl = uifactory.addTextElement("admin.url", 128, url, formLayout);
 		baseUrlEl.setMandatory(true);
 		
-		String documentBaseUrl = office365Module.getDocumentBaseUrl();
-		documentBaseUrlEl = uifactory.addTextElement("admin.document.url", 128, documentBaseUrl, formLayout);
-		documentBaseUrlEl.setMandatory(true);
+		String hostEditBaseUrl = office365Module.getHostEditBaseUrl();
+		hostEditBaseUrlEl = uifactory.addTextElement("admin.document.url", 128, hostEditBaseUrl, formLayout);
+		hostEditBaseUrlEl.setMandatory(true);
 		
 		refreshDiscoveryLink = uifactory.addFormLink("admin.refresh.discovery", "admin.refresh.discovery", "admin.refresh.discovery.label", formLayout, Link.BUTTON);
 		refreshDiscoveryLink.setHelpTextKey("admin.refresh.discovery.help", null);
@@ -129,7 +129,7 @@ public class Office365AdminController extends FormBasicController {
 		
 		if (enabledEl.isAtLeastSelected(1)) {
 			allOk &= validateIsMandatory(baseUrlEl);
-			allOk &= validateIsMandatory(documentBaseUrlEl);
+			allOk &= validateIsMandatory(hostEditBaseUrlEl);
 		}
 		
 		return allOk & super.validateFormLogic(ureq);
@@ -148,9 +148,9 @@ public class Office365AdminController extends FormBasicController {
 			doRefreshDiscovery();
 		}
 		
-		String documentBaseUrl = documentBaseUrlEl.getValue();
-		documentBaseUrl = documentBaseUrl.endsWith("/")? documentBaseUrl.substring(0, documentBaseUrl.length() - 1): documentBaseUrl;
-		office365Module.setDocumentBaseUrl(documentBaseUrl);
+		String hostEditBaseUrl = hostEditBaseUrlEl.getValue();
+		hostEditBaseUrl = hostEditBaseUrl.endsWith("/")? hostEditBaseUrl.substring(0, hostEditBaseUrl.length() - 1): hostEditBaseUrl;
+		office365Module.setHostEditBaseUrl(hostEditBaseUrl);
 		
 		boolean dataTransferConfirmationEnabled = dataTransferConfirmationEnabledEl.isAtLeastSelected(1);
 		office365Module.setDataTransferConfirmationEnabled(dataTransferConfirmationEnabled);

src/main/resources/serviceconfig/olat.properties

@@ -1727,7 +1727,7 @@ onlyoffice.thumbnails.enabled=true
 office365.enabled=false
 office365.baseUrl=https://office365.example.org/
 office365.data.transfer.confirmation.enabled=false
-office365.document.baseUrl=https://wopi.frentix.com/${instance.id}
+office365.host.edit.baseUrl=https://wopi.frentix.com/${instance.id}
 office365.usage.restricted.authors=false
 office365.usage.restricted.coaches=false
 office365.usage.restricted.managers=false