From e275a84d25de3d1aac78ef1a4860fc0b1787ce87 Mon Sep 17 00:00:00 2001
From: anghelutar <anghelutar@yahoo.com>
Date: Thu, 11 Feb 2021 20:36:42 +0100
Subject: [PATCH] Simplifications.

---
 .../binder/AlfrescoStatusMetrics.java         | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/AlfrescoStatusMetrics.java b/alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/AlfrescoStatusMetrics.java
index be8c9138..725f304e 100644
--- a/alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/AlfrescoStatusMetrics.java
+++ b/alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/AlfrescoStatusMetrics.java
@@ -18,7 +18,6 @@ public class AlfrescoStatusMetrics implements MeterBinder {
 
     private RepoAdminService repoAdminService;
     private RetryingTransactionHelper retryingTransactionHelper;
-
     public AlfrescoStatusMetrics(RepoAdminService repoAdminService, RetryingTransactionHelper retryingTransactionHelper) {
         this.repoAdminService = repoAdminService;
         this.retryingTransactionHelper = retryingTransactionHelper;
@@ -27,9 +26,9 @@ public AlfrescoStatusMetrics(RepoAdminService repoAdminService, RetryingTransact
     @Override
     public void bindTo(@Nonnull MeterRegistry meterRegistry) {
         LOGGER.info("Registering Alfresco Status metrics");
-        Gauge.builder(String.format("%s.%s", STATUS_PREFIX, "readonly"),
-                repoAdminService,
-                x -> getReadOnly(repoAdminService))
+        Gauge.builder(STATUS_PREFIX + ".readonly",
+                       repoAdminService,
+		               this::getReadOnly)
                 .description("Metric about Alfresco being in read-only mode")
                 .register(meterRegistry);
 
@@ -38,26 +37,11 @@ public void bindTo(@Nonnull MeterRegistry meterRegistry) {
     private double getReadOnly(RepoAdminService repoAdminService) {
         final boolean[] isReadOnly = {false};
 
-        retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>() {
-
-            @Override
-            public Object execute() throws Throwable {
-                AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() {
-
-                    @Override
-                    public Object doWork() throws Exception {
-                        isReadOnly[0] = repoAdminService.getUsage().isReadOnly();
-
-                        return null;
-                    }
-                }, AuthenticationUtil.getAdminUserName());
-                return null;
-            }
-        },true);
+        retryingTransactionHelper.doInTransaction(()->AuthenticationUtil.runAsSystem(()->isReadOnly[0]=repoAdminService.getUsage().isReadOnly()),true);
 
         if(isReadOnly[0])
             return 1d;
         else
             return 0d;
     }
-}
\ No newline at end of file
+}