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 2021/06/11 08:49:11 UTC
[isis] branch ISIS-2726 updated: ISIS-2726: renames
QueryResultsCacheControlDefault to ...ForFixtures
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2726
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2726 by this push:
new ff0c455 ISIS-2726: renames QueryResultsCacheControlDefault to ...ForFixtures
ff0c455 is described below
commit ff0c455e0fe300408719bf4b514f4031070ba96e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 11 09:48:49 2021 +0100
ISIS-2726: renames QueryResultsCacheControlDefault to ...ForFixtures
---
.../runtimeservices/queryresultscache/QueryResultsCacheDefault.java | 2 +-
.../testing/fixtures/applib/IsisModuleTestingFixturesApplib.java | 5 ++---
...ControlDefault.java => QueryResultsCacheControlForFixtures.java} | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
index 54af533..1f1240e 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
@@ -71,7 +71,7 @@ public class QueryResultsCacheDefault implements QueryResultsCache {
return action.call();
}
final Key cacheKey = new Key(callingClass, methodName);
- return executeWithCaching(()->action.call(), cacheKey);
+ return executeWithCaching(action::call, cacheKey);
}
@Override
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
index 6d0d52b..7e65b79 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
@@ -21,9 +21,8 @@ package org.apache.isis.testing.fixtures.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.ExecutionParametersService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlDefault;
+import org.apache.isis.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlForFixtures;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
import org.apache.isis.subdomains.spring.applib.IsisModuleSubdomainsSpringApplib;
import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService;
@@ -36,7 +35,7 @@ import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService
// @Service's
FixturesLifecycleService.class,
ModuleWithFixturesService.class,
- QueryResultsCacheControlDefault.class,
+ QueryResultsCacheControlForFixtures.class,
// @DomainService's
FixtureScripts.class,
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlDefault.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
similarity index 92%
rename from testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlDefault.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
index 57cac8d..c113d3d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlDefault.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
@@ -37,11 +37,11 @@ import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
* In separate class because {@link QueryResultsCache} itself is request-scoped
*/
@Service
-@Named("isis.testing.fixtures.FixtureQueryResultsCacheControlDefault")
+@Named("isis.testing.fixtures.QueryResultsCacheControlForFixtures")
@Order(OrderPrecedence.MIDPOINT)
@Primary
-@Qualifier("Default")
-public class QueryResultsCacheControlDefault implements QueryResultsCacheControl {
+@Qualifier("ForFixtures")
+public class QueryResultsCacheControlForFixtures implements QueryResultsCacheControl {
@EventListener(FixturesInstallingEvent.class)
public void onFixturesInstallingEvent(FixturesInstallingEvent ev) {