CAUSEWAY-3636: fixes name of config prop; fixes injection on bootstra…

…p... ... need to use Provider<QueryResultsCache>
apache · Nov 13, 2023 · 6da0b4d · 6da0b4d
1 parent ce3ca48
commit 6da0b4d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -3446,9 +3446,9 @@ public enum PersistPolicy {
         @Data
         public static class LayoutLoaders {
 
-            private final GitHub gitHub = new GitHub();
+            private final Github github = new Github();
             @Data
-            public static class GitHub {
+            public static class Github {
 
                 /**
                  * eg <code>apache/causeway-app-simpleapp</code>

diff --git a/...apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java b/...apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java
@@ -81,7 +81,7 @@ public class CausewayModuleExtLayoutLoadersGithub {
     @Bean(name = "GithubSearch")
     public RestTemplate restTemplateForGithubSearch(final CausewayConfiguration causewayConfiguration) {
 
-        val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().getApiKey();
+        val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().getApiKey();
 
         return new RestTemplateBuilder()
                 .rootUri("https://api.github.com")
@@ -108,8 +108,8 @@ public RestTemplate restTemplateForGithubSearch(final CausewayConfiguration caus
     @Bean(name = "GithubContent")
     public RestTemplate restTemplateForGithubContent(final CausewayConfiguration causewayConfiguration) {
 
-        val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().getApiKey();
-        val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().getRepository();
+        val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().getApiKey();
+        val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().getRepository();
 
         return new RestTemplateBuilder()
                 .rootUri(String.format("https://api.github.com/repos/%s", repo))

diff --git a/...ava/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java b/...ava/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
@@ -114,7 +114,7 @@ public class ActionDomainEvent extends LayoutLoadersGitHubMenu.ActionDomainEvent
     }
 
     boolean isConfigured() {
-        val layoutLoadersGitHub = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub();
+        val layoutLoadersGitHub = causewayConfiguration.getExtensions().getLayoutLoaders().getGithub();
         return layoutLoadersGitHub.getRepository() != null &&
                layoutLoadersGitHub.getApiKey() != null;
     }

diff --git a/...ache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java b/...ache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
@@ -23,6 +23,7 @@
 import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Provider;
 
 import org.apache.causeway.extensions.layoutloaders.github.menu.LayoutLoadersGitHubMenu;
 
@@ -57,28 +58,28 @@ public class LayoutResourceLoaderFromGithub implements LayoutResourceLoader {
     final RestTemplate restTemplateForContent;
     final CausewayConfiguration causewayConfiguration;
     final LayoutLoadersGitHubMenu layoutLoadersGitHubMenu;
-    final QueryResultsCache queryResultsCache;
+    final Provider<QueryResultsCache> queryResultsCacheProvider;
 
     @Inject
     public LayoutResourceLoaderFromGithub(
             final @Qualifier("GithubSearch")  RestTemplate restTemplateForSearch,
             final @Qualifier("GithubContent") RestTemplate restTemplateForContent,
             final CausewayConfiguration causewayConfiguration,
             final LayoutLoadersGitHubMenu layoutLoadersGitHubMenu,
-            final QueryResultsCache queryResultsCache) {
+            final Provider<QueryResultsCache> queryResultsCacheProvider) {
         this.restTemplateForSearch = restTemplateForSearch;
         this.restTemplateForContent = restTemplateForContent;
         this.causewayConfiguration = causewayConfiguration;
         this.layoutLoadersGitHubMenu = layoutLoadersGitHubMenu;
-        this.queryResultsCache = queryResultsCache;
+        this.queryResultsCacheProvider = queryResultsCacheProvider;
     }
 
     @Override
     public Try<LayoutResource> tryLoadLayoutResource(
             final @NonNull Class<?> type,
             final @NonNull String candidateResourceName) {
         return layoutLoadersGitHubMenu.isEnabled()
-                ? queryResultsCache.execute(() -> tryLoadLayoutResource(candidateResourceName),
+                ? queryResultsCacheProvider.get().execute(() -> tryLoadLayoutResource(candidateResourceName),
                         getClass(), "tryLoadLayoutResource", candidateResourceName)
                 : Try.empty();
     }
@@ -95,7 +96,7 @@ private Try<LayoutResource> tryLoadLayoutResource(final String candidateResource
     private Try<String> search(final @NonNull String candidateResourceName) {
 
         try {
-            val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().getRepository();
+            val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().getRepository();
             val searchParams = new HashMap<String, String>();
             searchParams.put("q", String.format("%s+in:path+repo:%s", candidateResourceName, repo));
 

diff --git a/...youtloaders/github/spiimpl/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java b/...youtloaders/github/spiimpl/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
@@ -34,8 +34,8 @@ void preconditions() {
     void setup() {
 
         val causewayConfiguration = new CausewayConfiguration(null);
-        causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().setApiKey(getApiKey());
-        causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub().setRepository("apache/causeway-app-simpleapp");
+        causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().setApiKey(getApiKey());
+        causewayConfiguration.getExtensions().getLayoutLoaders().getGithub().setRepository("apache/causeway-app-simpleapp");
 
         val module = new CausewayModuleExtLayoutLoadersGithub();
         val restTemplateForSearch = module.restTemplateForGithubSearch(causewayConfiguration);
@@ -46,7 +46,7 @@ void setup() {
         layoutLoaderMenu.new enableDynamicLayoutLoading().act();
         Assertions.assertThat(layoutLoaderMenu.isEnabled()).isTrue();
 
-        loader = new LayoutResourceLoaderFromGithub(restTemplateForSearch, restTemplateForContent, causewayConfiguration, layoutLoaderMenu, queryResultsCache);
+        loader = new LayoutResourceLoaderFromGithub(restTemplateForSearch, restTemplateForContent, causewayConfiguration, layoutLoaderMenu, () -> queryResultsCache);
     }
 
     @Test

diff --git a/extensions/core/layoutloaders/gitlab/src/test/resources/.gitignore b/extensions/core/layoutloaders/gitlab/src/test/resources/.gitignore
@@ -0,0 +1 @@
+*.http