From d97510dfbaf94953e5e3cb72b735366a7d6d0a85 Mon Sep 17 00:00:00 2001
From: Sara <sara.aspery@alfresco.com>
Date: Wed, 1 Sep 2021 14:42:22 +0100
Subject: [PATCH] ACS-1880 handle defaults for missing properties (#687)

* ACS-1880 handle defaults for missing properties

* ACS-1880 handle defaults for missing properties
---
 .../src/main/resources/alfresco/public-rest-context.xml     | 4 ++--
 .../main/resources/alfresco/content-services-context.xml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote-api/src/main/resources/alfresco/public-rest-context.xml b/remote-api/src/main/resources/alfresco/public-rest-context.xml
index 6099ddced5..51c33fd95a 100644
--- a/remote-api/src/main/resources/alfresco/public-rest-context.xml
+++ b/remote-api/src/main/resources/alfresco/public-rest-context.xml
@@ -1080,8 +1080,8 @@
     <!-- REST API direct access URL configuration settings -->
     <bean id="restApiDirectUrlConfig" class="org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig" init-method="init">
         <property name="systemWideDirectUrlConfig" ref="systemWideDirectUrlConfig" />
-        <property name="enabled" value="${restApi.directAccessUrl.enabled}" />
-        <property name="defaultExpiryTimeInSec" value="${restApi.directAccessUrl.defaultExpiryTimeInSec}" />
+        <property name="enabled" value="#{T(Boolean).valueOf('${restApi.directAccessUrl.enabled}')}"/>
+        <property name="defaultExpiryTimeInSec" value="#{T(Integer).parseInt('${restApi.directAccessUrl.defaultExpiryTimeInSec}')}" />
     </bean>
 
     <!-- OpenCMIS -->
diff --git a/repository/src/main/resources/alfresco/content-services-context.xml b/repository/src/main/resources/alfresco/content-services-context.xml
index a086db2e41..dfbdf56633 100644
--- a/repository/src/main/resources/alfresco/content-services-context.xml
+++ b/repository/src/main/resources/alfresco/content-services-context.xml
@@ -360,9 +360,9 @@
 
    <!-- System direct access URL configuration settings -->
    <bean id="systemWideDirectUrlConfig" class="org.alfresco.repo.content.directurl.SystemWideDirectUrlConfig" init-method="init">
-      <property name="enabled" value="${system.directAccessUrl.enabled}" />
-      <property name="defaultExpiryTimeInSec" value="${system.directAccessUrl.defaultExpiryTimeInSec}" />
-      <property name="maxExpiryTimeInSec" value="${system.directAccessUrl.maxExpiryTimeInSec}" />
+      <property name="enabled" value="#{T(Boolean).valueOf('${system.directAccessUrl.enabled}')}"/>
+      <property name="defaultExpiryTimeInSec" value="#{T(Integer).parseInt('${system.directAccessUrl.defaultExpiryTimeInSec}')}" />
+      <property name="maxExpiryTimeInSec" value="#{T(Integer).parseInt('${system.directAccessUrl.maxExpiryTimeInSec}')}" />
    </bean>
 
    <!-- Abstract Direct Access URL configuration -->