You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/30 17:20:34 UTC

[isis] 03/04: ISIS-2086: refactors 'isis.viewer.restfulobjects.honorUiHints' to type-safe config

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b5e437b0eeb2f8681721f10e46186a197409b0d9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 30 18:15:29 2019 +0100

    ISIS-2086: refactors 'isis.viewer.restfulobjects.honorUiHints' to type-safe config
---
 .../src/main/java/org/apache/isis/config/IsisConfiguration.java       | 1 +
 .../org/apache/isis/viewer/restfulobjects/server/ResourceContext.java | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index e507d13..aed92a7 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -424,6 +424,7 @@ public class IsisConfiguration {
         @Data
         public static class Restfulobjects {
             private String basePath = "/restful";
+            private boolean honorUiHints = false;
             private boolean strictAcceptChecking = false;
             private final Gsoc2013 gsoc2013 = new Gsoc2013();
             @Data
diff --git a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index a6bc036..05a00b2 100644
--- a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -218,8 +218,6 @@ public class ResourceContext extends RuntimeContextBase implements RendererConte
 
     // -- configuration settings
 
-    private static final boolean HONOR_UI_HINTS_DEFAULT = false;
-
     private static final boolean OBJECT_PROPERTY_VALUES_ONLY_DEFAULT = false;
 
     private static final boolean SUPPRESS_DESCRIBED_BY_LINKS_DEFAULT = false;
@@ -231,7 +229,7 @@ public class ResourceContext extends RuntimeContextBase implements RendererConte
 
     @Override
     public boolean honorUiHints() {
-        return getConfigurationLegacy().getBoolean("isis.viewer.restfulobjects.honorUiHints", HONOR_UI_HINTS_DEFAULT);
+        return getConfiguration().getViewer().getRestfulobjects().isHonorUiHints();
     }
 
     @Override