You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2026/08/17 10:00:20 UTC
(causeway) branch main updated: CAUSEWAY-4044: removes trivial factory methods from _Maps
This is an automated email from the ASF dual-hosted git repository.
andi-huber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new 27310294329 CAUSEWAY-4044: removes trivial factory methods from _Maps
27310294329 is described below
commit 27310294329a013e6e52a3c5849d742a61b06ccb
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Aug 17 10:29:14 2026 +0200
CAUSEWAY-4044: removes trivial factory methods from _Maps
---
.../jaxb/CatalogingSchemaOutputResolver.java | 6 +-
.../queryresultscache/QueryResultsCache.java | 60 +++++------
.../commons/internal/collections/_Maps.java | 49 ++-------
.../internal/debug/xray/XrayModelSimple.java | 5 +-
.../commons/internal/debug/xray/XrayUi.java | 24 ++---
.../internal/debug/xray/_CallStackMerger.java | 4 +-
.../org/apache/causeway/commons/io/JaxbUtils.java | 28 +++--
.../config/beans/CausewayComponentCollector.java | 16 ++-
.../core/config/converters/PatternsConverter.java | 17 ++-
.../core/interaction/scope/InteractionScope.java | 16 ++-
.../annotation/HomePageFacetAnnotationFactory.java | 4 +-
.../core/metamodel/layout/DeweyOrderSet.java | 7 +-
.../ApplicationFeatureRepositoryDefault.java | 16 +--
.../classsubstitutor/ClassSubstitutorRegistry.java | 20 ++--
.../services/grid/GridInitializationModel.java | 6 +-
.../services/metamodel/MetaModelExporter.java | 8 +-
.../services/registry/ServiceRegistryDefault.java | 17 ++-
.../core/metamodel/spec/feature/ObjectMember.java | 4 +-
.../metamodel/spec/impl/LogicalTypeResolver.java | 11 +-
.../core/metamodel/util/snapshot/XmlSnapshot.java | 4 +-
.../valuetypes/ValueSemanticsResolverDefault.java | 17 ++-
.../mmtestsupport/MetaModelContext_forTesting.java | 4 +-
.../mmtestsupport/ServiceRegistry_forTesting.java | 4 +-
.../core/mmtestsupport/_ServiceInjectorLegacy.java | 38 +++----
.../core/runtimeservices/i18n/po/PoReader.java | 8 +-
.../core/runtimeservices/i18n/po/PoWriter.java | 4 +-
.../bootstrap/MenuBarsServiceBootstrap.java | 7 +-
.../scratchpad/ScratchpadDefault.java | 19 ++--
.../manager/AuthenticationManager.java | 67 +++++-------
.../confmenu/ConfigurationViewServiceDefault.java | 46 ++++-----
.../excel/applib/service/_ExcelConverter.java | 4 +-
.../extensions/excel/testing/ExcelFixture.java | 4 +-
.../integration/authorizor/AuthorizorSecman.java | 34 +++---
.../wkt/ui/viewer/EventProviderAbstract.java | 19 ++--
.../changetracking/EntityChangeTrackerDefault.java | 115 +++++++++------------
.../testdomain/util/kv/KVStoreForTesting.java | 15 ++-
.../fixturescripts/ExecutionParametersDefault.java | 110 ++++++++------------
.../applib/fixturescripts/FixtureResultList.java | 6 +-
.../applib/fixturescripts/FixtureScript.java | 9 +-
.../applib/fixturescripts/FixtureScripts.java | 2 +-
.../integtestsupport/applib/ApprovalsOptions.java | 4 +-
.../integration/ObjectFactoryForIntegration.java | 7 +-
.../applib/soap/SoapPublishedEndpoints.java | 23 ++---
.../restfulobjects/applib/util/PathNode.java | 4 +-
.../client/RestfulClientMediaType.java | 10 +-
.../rendering/ReprRendererAbstract.java | 4 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../internal/ValueSchemaFactoryDefault.java | 20 ++--
.../service/valuerender/_JsonValueConverters.java | 4 +-
.../model/models/test/UiObjectWkt_hintsTest.java | 23 ++---
.../attributes/AttributePanelWithFormField.java | 49 +++------
.../widgets/breadcrumbs/BreadcrumbModel.java | 6 +-
.../registries/pages/PageClassRegistryDefault.java | 33 +++---
.../services/HintStoreUsingWicketSession.java | 2 +-
54 files changed, 442 insertions(+), 605 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
index 9a34490f9a9..f639787ac0a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
@@ -23,6 +23,7 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,6 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.causeway.commons.internal.codec._DocumentFactories;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -64,7 +64,7 @@ public List<String> getNamespaceUris() {
return namespaceUris;
}
- private final Map<String, StreamResultWithWriter> schemaResultByNamespaceUri = _Maps.newLinkedHashMap();
+ private final Map<String, StreamResultWithWriter> schemaResultByNamespaceUri = new LinkedHashMap<>();
public String getSchemaTextFor(final String namespaceUri) {
final StreamResultWithWriter streamResult = schemaResultByNamespaceUri.get(namespaceUri);
@@ -140,7 +140,7 @@ public Result createOutput(
}
public Map<String, String> asMap() {
- final Map<String,String> map = _Maps.newLinkedHashMap();
+ final Map<String,String> map = new LinkedHashMap<>();
final List<String> namespaceUris = getNamespaceUris();
for (String namespaceUri : namespaceUris) {
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
index ac3a9b79682..4fa632a85b9 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
@@ -19,25 +19,23 @@
package org.apache.causeway.applib.services.queryresultscache;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Maps;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -72,7 +70,7 @@ public class QueryResultsCache implements DisposableBean {
static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".QueryResultsCache";
- private final Map<Key, Value<?>> cache = _Maps.newHashMap();
+ private final Map<Key, Value<?>> cache = new HashMap<>();
/**
* Executes the callable if not already cached for the supplied calling
@@ -101,53 +99,47 @@ public <T> T execute(
}
public <R> R execute(final MethodReferences.Call0<? extends R> action, final Class<?> callingClass, final String methodName) {
- if(isIgnoreCache()) {
- return action.call();
- }
+ if(isIgnoreCache())
+ return action.call();
final Key cacheKey = new Key(callingClass, methodName);
return executeWithCaching(action::call, cacheKey);
}
public <R, A0> R execute(final MethodReferences.Call1<? extends R, A0> action, final Class<?> callingClass, final String methodName, final A0 arg0) {
- if(isIgnoreCache()) {
- return action.call(arg0);
- }
+ if(isIgnoreCache())
+ return action.call(arg0);
final Key cacheKey = new Key(callingClass, methodName, arg0);
return executeWithCaching(()->action.call(arg0), cacheKey);
}
public <R, A0, A1> R execute(final MethodReferences.Call2<? extends R, A0, A1> action, final Class<?> callingClass, final String methodName, final A0 arg0,
final A1 arg1) {
- if(isIgnoreCache()) {
- return action.call(arg0, arg1);
- }
+ if(isIgnoreCache())
+ return action.call(arg0, arg1);
final Key cacheKey = new Key(callingClass, methodName, arg0, arg1);
return executeWithCaching(()->action.call(arg0, arg1), cacheKey);
}
public <R, A0, A1, A2> R execute(final MethodReferences.Call3<? extends R, A0, A1, A2> action, final Class<?> callingClass, final String methodName,
final A0 arg0, final A1 arg1, final A2 arg2) {
- if(isIgnoreCache()) {
- return action.call(arg0, arg1, arg2);
- }
+ if(isIgnoreCache())
+ return action.call(arg0, arg1, arg2);
final Key cacheKey = new Key(callingClass, methodName, arg0, arg1, arg2);
return executeWithCaching(()->action.call(arg0, arg1, arg2), cacheKey);
}
public <R, A0, A1, A2, A3> R execute(final MethodReferences.Call4<? extends R, A0, A1, A2, A3> action, final Class<?> callingClass,
final String methodName, final A0 arg0, final A1 arg1, final A2 arg2, final A3 arg3) {
- if(isIgnoreCache()) {
- return action.call(arg0, arg1, arg2, arg3);
- }
+ if(isIgnoreCache())
+ return action.call(arg0, arg1, arg2, arg3);
final Key cacheKey = new Key(callingClass, methodName, arg0, arg1, arg2, arg3);
return executeWithCaching(()->action.call(arg0, arg1, arg2, arg3), cacheKey);
}
public <R, A0, A1, A2, A3, A4> R execute(final MethodReferences.Call5<? extends R, A0, A1, A2, A3, A4> action, final Class<?> callingClass,
final String methodName, final A0 arg0, final A1 arg1, final A2 arg2, final A3 arg3, final A4 arg4) {
- if(isIgnoreCache()) {
- return action.call(arg0, arg1, arg2, arg3, arg4);
- }
+ if(isIgnoreCache())
+ return action.call(arg0, arg1, arg2, arg3, arg4);
final Key cacheKey = new Key(callingClass, methodName, arg0, arg1, arg2, arg3, arg4);
return executeWithCaching(()->action.call(arg0, arg1, arg2, arg3, arg4), cacheKey);
}
@@ -181,9 +173,8 @@ private <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey)
try {
final Value<?> cacheValue = cache.get(cacheKey);
logHitOrMiss(cacheKey, cacheValue);
- if(cacheValue != null) {
- return _Casts.uncheckedCast(cacheValue.getResult());
- }
+ if(cacheValue != null)
+ return _Casts.uncheckedCast(cacheValue.getResult());
// cache miss, so get the result...
T result = callable.call();
@@ -208,9 +199,8 @@ private <T> void put(final Key cacheKey, final T result) {
}
private static void logHitOrMiss(final Key cacheKey, final Value<?> cacheValue) {
- if(!log.isDebugEnabled()) {
- return;
- }
+ if(!log.isDebugEnabled())
+ return;
log.debug("{}: {}", (cacheValue != null ? "HIT" : "MISS"), cacheKey.toString());
}
@@ -238,7 +228,7 @@ public void destroy() throws Exception {
private boolean isIgnoreCache() {
return _NullSafe.stream(cacheControl)
- .anyMatch(c->c.isIgnoreCache());
+ .anyMatch(QueryResultsCacheControl::isIgnoreCache);
}
}
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
index 2d9527520fb..c5ca705eba6 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
@@ -21,7 +21,6 @@
import java.util.AbstractMap;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -30,7 +29,6 @@
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
-import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -39,13 +37,12 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
-
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
/**
* <h1>- internal use only -</h1>
@@ -94,20 +91,20 @@ public static interface AliasMap<K, V> extends Map<K, V> {
// -- UNMODIFIABLE MAP
public static <K, V> Map<K, V> unmodifiable(final K k1, final V v1) {
- final LinkedHashMap<K, V> mapPreservingOrder = newLinkedHashMap();
+ final LinkedHashMap<K, V> mapPreservingOrder = new LinkedHashMap<>();
mapPreservingOrder.put(k1, v1);
return Collections.unmodifiableMap(mapPreservingOrder);
}
public static <K, V> Map<K, V> unmodifiable(final K k1, final V v1, final K k2, final V v2) {
- final LinkedHashMap<K, V> mapPreservingOrder = newLinkedHashMap();
+ final LinkedHashMap<K, V> mapPreservingOrder = new LinkedHashMap<>();
mapPreservingOrder.put(k1, v1);
mapPreservingOrder.put(k2, v2);
return Collections.unmodifiableMap(mapPreservingOrder);
}
public static <K, V> Map<K, V> unmodifiable(final K k1, final V v1, final K k2, final V v2, final K k3, final V v3) {
- final LinkedHashMap<K, V> mapPreservingOrder = newLinkedHashMap();
+ final LinkedHashMap<K, V> mapPreservingOrder = new LinkedHashMap<>();
mapPreservingOrder.put(k1, v1);
mapPreservingOrder.put(k2, v2);
mapPreservingOrder.put(k3, v3);
@@ -115,7 +112,7 @@ public static <K, V> Map<K, V> unmodifiable(final K k1, final V v1, final K k2,
}
public static <K, V> Map<K, V> unmodifiable(final K k1, final V v1, final K k2, final V v2, final K k3, final V v3, final K k4, final V v4) {
- final LinkedHashMap<K, V> mapPreservingOrder = newLinkedHashMap();
+ final LinkedHashMap<K, V> mapPreservingOrder = new LinkedHashMap<>();
mapPreservingOrder.put(k1, v1);
mapPreservingOrder.put(k2, v2);
mapPreservingOrder.put(k3, v3);
@@ -128,7 +125,7 @@ public static <K, V> Map<K, V> unmodifiableEntries(final Map.@NonNull Entry<? ex
if(entries.length==0)
return Collections.emptyMap();
- final LinkedHashMap<K, V> mapPreservingOrder = newLinkedHashMap();
+ final LinkedHashMap<K, V> mapPreservingOrder = new LinkedHashMap<>();
Stream.of(entries)
.forEach(entry->mapPreservingOrder.put(entry.getKey(), entry.getValue()));
@@ -220,36 +217,6 @@ public static <K, V> ListMultimap<V, K> invertToListMultimap(final Map<K, V> inp
return result;
}
- // -- FACTORIES ...
-
- // -- HASH MAP
-
- public static <K, V> HashMap<K, V> newHashMap() {
- return new HashMap<>();
- }
-
- // -- LINKED HASH MAP
-
- public static <K, V> LinkedHashMap<K, V> newLinkedHashMap() {
- return new LinkedHashMap<>();
- }
-
- // -- CONCURRENT HASH MAP
-
- public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap() {
- return new ConcurrentHashMap<>();
- }
-
- // -- TREE MAP
-
- public static <K, V> TreeMap<K, V> newTreeMap() {
- return new TreeMap<>();
- }
-
- public static <K, V> TreeMap<K, V> newTreeMap(final Comparator<? super K> comparator) {
- return new TreeMap<>(comparator);
- }
-
// -- ALIAS MAP
private record KeyPair<K>(
@@ -323,7 +290,7 @@ public void clear() {
// -- HELPER
- private final Map<K, KeyPair<K>> pairByAliasKey = _Maps.newHashMap();
+ private final Map<K, KeyPair<K>> pairByAliasKey = new HashMap<>();
private void putAliasKeys(final K key, final Can<K> aliasKeys, final boolean remap) {
if(aliasKeys.isNotEmpty()) {
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModelSimple.java b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModelSimple.java
index c8a5a8f2b0b..9421360baf9 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModelSimple.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModelSimple.java
@@ -21,14 +21,13 @@
import java.util.Map;
import java.util.Optional;
import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import org.jspecify.annotations.NonNull;
-import org.apache.causeway.commons.internal.collections._Maps;
-
record XrayModelSimple(
MutableTreeNode rootNode,
Map<String, MutableTreeNode> nodesById,
@@ -36,7 +35,7 @@ record XrayModelSimple(
XrayModelSimple(
final MutableTreeNode rootNode){
- this(rootNode, _Maps.newConcurrentHashMap(), _Maps.newConcurrentHashMap());
+ this(rootNode, new ConcurrentHashMap<>(), new ConcurrentHashMap<>());
}
@Override
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayUi.java b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayUi.java
index 46521763beb..22bbcd21769 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayUi.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayUi.java
@@ -31,6 +31,7 @@
import java.net.URL;
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
@@ -58,7 +59,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.debug.xray.XrayModel.HasIdAndLabel;
import org.apache.causeway.commons.internal.debug.xray.XrayModel.Stickiness;
@@ -96,9 +96,8 @@ public static void updateModel(final Consumer<XrayModel> consumer) {
public static void waitForShutdown() {
if(latch==null
- || INSTANCE == null) {
- return;
- }
+ || INSTANCE == null)
+ return;
System.err.println("Waiting for XrayUi to shut down...");
try {
latch.await();
@@ -130,9 +129,8 @@ protected XrayUi(final int defaultCloseOperation) {
tree.getSelectionModel().addTreeSelectionListener((final TreeSelectionEvent e) -> {
var selPath = e.getNewLeadSelectionPath();
- if(selPath==null) {
- return; // ignore event
- }
+ if(selPath==null)
+ return; // ignore event
var selectedNode = (DefaultMutableTreeNode) selPath.getLastPathComponent();
var userObject = selectedNode.getUserObject();
@@ -245,12 +243,11 @@ private Optional<HasIdAndLabel> extractUserObject(final DefaultMutableTreeNode n
}
private boolean canRemoveNode(final DefaultMutableTreeNode node) {
- if(node.getParent()==null) {
- return false; // don't remove root
- }
+ if(node.getParent()==null)
+ return false; // don't remove root
return extractUserObject(node)
.map(HasIdAndLabel::getStickiness)
- .map(stickiness->stickiness.isCanDeleteNode())
+ .map(Stickiness::isCanDeleteNode)
.orElse(true); // default: allow removal
}
@@ -351,7 +348,7 @@ private JScrollPane layoutUIAndGetDetailPanel(final JTree masterTree) {
// -- CUSTOM TREE NODE ICONS
- private final Map<String, Optional<ImageIcon>> iconCache = _Maps.newConcurrentHashMap();
+ private final Map<String, Optional<ImageIcon>> iconCache = new ConcurrentHashMap<>();
@RequiredArgsConstructor
class XrayTreeCellRenderer implements TreeCellRenderer {
@@ -373,8 +370,7 @@ public Component getTreeCellRendererComponent(
delegate.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
Object o = ((DefaultMutableTreeNode) value).getUserObject();
- if (o instanceof XrayDataModel) {
- XrayDataModel dataModel = (XrayDataModel) o;
+ if (o instanceof XrayDataModel dataModel) {
var imageIcon = iconCache.computeIfAbsent(dataModel.getIconResource(), iconResource->{
URL imageUrl = getClass().getResource(dataModel.getIconResource());
return Optional.ofNullable(imageUrl)
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/_CallStackMerger.java b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/_CallStackMerger.java
index b0334dae815..6552d17b3f1 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/_CallStackMerger.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/_CallStackMerger.java
@@ -20,6 +20,7 @@
import java.util.ArrayDeque;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -30,7 +31,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.IndexedConsumer;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.debug.xray.XrayDataModel.LogEntry;
import org.apache.causeway.commons.internal.debug.xray.graphics.CallStackDiagram;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
@@ -118,7 +118,7 @@ private void print(final IntFunction<String> valueMapper,
private void initialize() {
var executionNodeSet = new HashSet<String>(); // temporary helper
- var executionNodeMap = _Maps.<Integer, String>newHashMap(); // StackStraceElement by unique id
+ var executionNodeMap = new HashMap<Integer, String>(); // StackStraceElement by unique id
var executionLanes = new ArrayList<int[]>();
diff --git a/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java b/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
index d203efa8f1a..10e09297ed6 100644
--- a/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
@@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
@@ -38,29 +39,26 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBContextFactory;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
-import jakarta.xml.bind.SchemaOutputResolver;
-import jakarta.xml.bind.Unmarshaller;
-
-import org.glassfish.jaxb.core.v2.runtime.IllegalAnnotationException;
-import org.glassfish.jaxb.runtime.v2.runtime.IllegalAnnotationsException;
-import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
-
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.codec._DocumentFactories;
import org.apache.causeway.commons.internal.collections._Arrays;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.functions._Functions;
import org.apache.causeway.commons.internal.reflection._ClassCache;
+import org.glassfish.jaxb.core.v2.runtime.IllegalAnnotationException;
+import org.glassfish.jaxb.runtime.v2.runtime.IllegalAnnotationsException;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContextFactory;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.SchemaOutputResolver;
+import jakarta.xml.bind.Unmarshaller;
import lombok.Builder;
import lombok.Data;
import lombok.Singular;
@@ -362,7 +360,7 @@ public static JAXBContext jaxbContextFor(final @NonNull Class<?> primaryClass, f
return contextOf(_Arrays.combine(primaryClass, additionalClassesToBeBound));
}
- private static Map<Class<?>, JAXBContext> jaxbContextByClass = _Maps.newConcurrentHashMap();
+ private static Map<Class<?>, JAXBContext> jaxbContextByClass = new ConcurrentHashMap<>();
public static JAXBContext jaxbContextFor(final Class<?> dtoClass, final boolean useCache) {
return useCache
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentCollector.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentCollector.java
index d4ab28beb7f..0c76c133fc5 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentCollector.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentCollector.java
@@ -20,22 +20,20 @@
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
+import org.apache.causeway.core.config.beans.CausewayBeanMetaData.DiscoveredBy;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
-
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.stereotype.Component;
-import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
-import org.apache.causeway.core.config.beans.CausewayBeanMetaData.DiscoveredBy;
-
import lombok.extern.slf4j.Slf4j;
/**
@@ -51,7 +49,7 @@ record CausewayComponentCollector(
CausewayComponentCollector(
final @NonNull BeanDefinitionRegistry registry,
final @NonNull CausewayBeanTypeClassifier causewayBeanTypeClassifier) {
- this(registry, causewayBeanTypeClassifier, _Maps.newConcurrentHashMap());
+ this(registry, causewayBeanTypeClassifier, new ConcurrentHashMap<>());
}
void collect(final String beanDefinitionName) {
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
index d39ce21682f..8e53e9cd5ac 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
@@ -18,20 +18,19 @@
*/
package org.apache.causeway.core.config.converters;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jakarta.inject.Named;
-
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+import jakarta.inject.Named;
@Component
@Named(CausewayModuleCoreConfig.NAMESPACE + "..PatternsConverter")
@@ -39,7 +38,7 @@
public class PatternsConverter implements Converter<String, Map<Pattern, String>> {
@Override
- public Map<Pattern, String> convert(String source) {
+ public Map<Pattern, String> convert(final String source) {
return toPatternMap(source);
}
@@ -55,11 +54,11 @@ public Map<Pattern, String> convert(String source) {
*/
private static final Pattern PATTERN_FOR_COLON_SEPARATED_PAIR = Pattern.compile("(?<methodRegex>[^:]+):(?<value>.+)");
- private static Map<Pattern, String> toPatternMap(String cssClassPatterns) {
- final Map<Pattern,String> valueByPattern = _Maps.newLinkedHashMap();
+ private static Map<Pattern, String> toPatternMap(final String cssClassPatterns) {
+ final Map<Pattern,String> valueByPattern = new LinkedHashMap<>();
if(cssClassPatterns != null) {
final StringTokenizer regexToCssClasses = new StringTokenizer(cssClassPatterns, ",");
- final Map<String,String> valueByRegex = _Maps.newLinkedHashMap();
+ final Map<String,String> valueByRegex = new LinkedHashMap<>();
while (regexToCssClasses.hasMoreTokens()) {
String regexToCssClass = regexToCssClasses.nextToken().trim();
if (_Strings.isNullOrEmpty(regexToCssClass)) {
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
index a2042ef5668..1fa6981a425 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
@@ -18,9 +18,13 @@
*/
package org.apache.causeway.core.interaction.scope;
+import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.apache.causeway.applib.services.iactn.InteractionService;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -28,11 +32,6 @@
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.config.Scope;
-import org.apache.causeway.applib.services.iactn.InteractionService;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -74,7 +73,7 @@ void preDestroy() {
* {@link InteractionScopeLifecycleHandler#onTopLevelInteractionPreDestroy()}), not any of the stacked.
* </p>
*/
- private ThreadLocal<Map<String, ScopedObject>> scopedObjects = ThreadLocal.withInitial(_Maps::newHashMap);
+ private final ThreadLocal<Map<String, ScopedObject>> scopedObjects = ThreadLocal.withInitial(HashMap::new);
/**
* @return an instance of the single bean matching the required type (InteractionService)
@@ -99,12 +98,11 @@ public Object get(final String name, final ObjectFactory<?> objectFactory) {
+ "InteractionScopeBeanFactoryPostProcessor registered and initialized.", name);
}
- if(!interactionService.isInInteraction()) {
- throw _Exceptions.illegalState("Creation of bean %s with @InteractionScope requires the "
+ if(!interactionService.isInInteraction())
+ throw _Exceptions.illegalState("Creation of bean %s with @InteractionScope requires the "
+ "calling %s to have an open Interaction on the thread-local stack. Running into "
+ "this issue might be caused by use of ... @Inject MyScopedBean bean ..., instead of "
+ "... @Inject Provider<MyScopedBean> provider ...", name, _Probe.currentThreadId());
- }
var existingScopedObject = scopedObjects.get().get(name);
if(existingScopedObject!=null) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index fc05d3b603a..5b64bb10640 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -20,6 +20,7 @@
import static org.apache.causeway.commons.internal.functions._Predicates.not;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -27,7 +28,6 @@
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.HomePage;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
@@ -73,7 +73,7 @@ public void process(final ProcessMethodContext processMethodContext) {
public void refineProgrammingModel(final ProgrammingModel programmingModel) {
programmingModel.addValidator(new MetaModelValidatorAbstract(getMetaModelContext(), MetaModelValidator.SKIP_MANAGED_BEANS) {
- private final Map<String, ObjectAction> actionsHavingHomePageFacet = _Maps.newHashMap();
+ private final Map<String, ObjectAction> actionsHavingHomePageFacet = new HashMap<>();
@Override
public void validateObjectEnter(final @NonNull ObjectSpecification spec) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
index b3fd0fb8e88..fe45dd10202 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
@@ -26,6 +26,7 @@
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.StringTokenizer;
+import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Stream;
@@ -73,7 +74,7 @@ public class DeweyOrderSet implements Comparable<DeweyOrderSet>, Iterable<Object
public static DeweyOrderSet createOrderSet(final Stream<? extends FacetHolder> identifiedHolders) {
- final SortedMap<String, SortedSet<FacetHolder>> sortedMembersByGroup = _Maps.newTreeMap();
+ final SortedMap<String, SortedSet<FacetHolder>> sortedMembersByGroup = new TreeMap<>();
final SortedSet<FacetHolder> nonAnnotatedGroup = _Sets.newTreeSet(MmSortUtils::memberIdentifierCompare);
// spin over all the members and put them into a Map of SortedSets
@@ -100,7 +101,7 @@ public static DeweyOrderSet createOrderSet(final Stream<? extends FacetHolder> i
// iteration will be in alphabetical order (ie parent groups before
// their children).
final Set<String> groupNames = sortedMembersByGroup.keySet();
- final SortedMap<String, DeweyOrderSet> orderSetsByGroup = _Maps.newTreeMap();
+ final SortedMap<String, DeweyOrderSet> orderSetsByGroup = new TreeMap<>();
for (final String string : groupNames) {
final String groupName = string;
@@ -306,7 +307,7 @@ protected void addAll(final SortedSet<?> sortedMembers) {
// ///////////////////////// reorderChildren //////////////////////
public void reorderChildren(final List<String> requiredOrder) {
- final LinkedHashMap<String,DeweyOrderSet> orderSets = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String,DeweyOrderSet> orderSets = new LinkedHashMap<>();
// remove all OrderSets from elements
// though remembering the order they were encountered
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 5f00d48fb37..28401701dee 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -27,6 +27,7 @@
import java.util.OptionalInt;
import java.util.SortedMap;
import java.util.SortedSet;
+import java.util.TreeMap;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
@@ -38,7 +39,6 @@
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.causeway.applib.services.appfeat.ApplicationMemberSort;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
@@ -80,13 +80,13 @@ public class ApplicationFeatureRepositoryDefault
// -- caches
private Map<String, ApplicationFeatureId> featureIdentifiersByName;
- final SortedMap<ApplicationFeatureId, ApplicationFeature> namespaceFeatures = _Maps.newTreeMap();
- private final SortedMap<ApplicationFeatureId, ApplicationFeature> typeFeatures = _Maps.newTreeMap();
- private final SortedMap<LogicalType, ApplicationFeatureId> typeFeatureIdByLogicalType = _Maps.newTreeMap();
- private final SortedMap<ApplicationFeatureId, ApplicationFeature> memberFeatures = _Maps.newTreeMap();
- private final SortedMap<ApplicationFeatureId, ApplicationFeature> propertyFeatures = _Maps.newTreeMap();
- private final SortedMap<ApplicationFeatureId, ApplicationFeature> collectionFeatures = _Maps.newTreeMap();
- private final SortedMap<ApplicationFeatureId, ApplicationFeature> actionFeatures = _Maps.newTreeMap();
+ final SortedMap<ApplicationFeatureId, ApplicationFeature> namespaceFeatures = new TreeMap<>();
+ private final SortedMap<ApplicationFeatureId, ApplicationFeature> typeFeatures = new TreeMap<>();
+ private final SortedMap<LogicalType, ApplicationFeatureId> typeFeatureIdByLogicalType = new TreeMap<>();
+ private final SortedMap<ApplicationFeatureId, ApplicationFeature> memberFeatures = new TreeMap<>();
+ private final SortedMap<ApplicationFeatureId, ApplicationFeature> propertyFeatures = new TreeMap<>();
+ private final SortedMap<ApplicationFeatureId, ApplicationFeature> collectionFeatures = new TreeMap<>();
+ private final SortedMap<ApplicationFeatureId, ApplicationFeature> actionFeatures = new TreeMap<>();
@Inject
public ApplicationFeatureRepositoryDefault(
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index f180dc79edb..d8ec74a0543 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -20,20 +20,17 @@
import java.util.List;
import java.util.Map;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.jspecify.annotations.Nullable;
-
-import org.springframework.stereotype.Component;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.functions._Predicates;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutor.Substitution;
+import org.jspecify.annotations.Nullable;
+import org.springframework.stereotype.Component;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.extern.slf4j.Slf4j;
/**
@@ -46,7 +43,7 @@
public class ClassSubstitutorRegistry {
private final List<ClassSubstitutor> classSubstitutors;
- private final Map<Class<?>, Substitution> cache = _Maps.newConcurrentHashMap();
+ private final Map<Class<?>, Substitution> cache = new ConcurrentHashMap<>();
@Inject
public ClassSubstitutorRegistry(final List<ClassSubstitutor> classSubstitutors) {
@@ -58,9 +55,8 @@ public ClassSubstitutorRegistry(final List<ClassSubstitutor> classSubstitutors)
* @return (non-null) the aggregated Substitution that applies to given originalClass
*/
public Substitution getSubstitution(final @Nullable Class<?> originalClass) {
- if(originalClass == null) {
- return Substitution.neverReplaceClass();
- }
+ if(originalClass == null)
+ return Substitution.neverReplaceClass();
return cache.computeIfAbsent(originalClass, this::findSubstitutionFor);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridInitializationModel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridInitializationModel.java
index 6f75f8d324e..c1d3fbfadb8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridInitializationModel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridInitializationModel.java
@@ -214,9 +214,9 @@ public void enter(final BSTabGroup bsTabGroup) {
// --
private final LinkedHashSet<String> allIds = new LinkedHashSet<>();
- private final LinkedHashMap<String, BSRow> rows = _Maps.newLinkedHashMap();
- private final LinkedHashMap<String, BSCol> cols = _Maps.newLinkedHashMap();
- private final LinkedHashMap<String, FieldSet> fieldSets = _Maps.newLinkedHashMap();
+ private final LinkedHashMap<String, BSRow> rows = new LinkedHashMap<>();
+ private final LinkedHashMap<String, BSCol> cols = new LinkedHashMap<>();
+ private final LinkedHashMap<String, FieldSet> fieldSets = new LinkedHashMap<>();
private BSCol colForUnreferencedActionsRef;
private FieldSet fieldSetForUnreferencedActionsRef;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelExporter.java
index 3e2a46aa56b..cabe912e942 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelExporter.java
@@ -21,6 +21,7 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -29,7 +30,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -89,7 +89,7 @@ MetamodelDto exportMetaModel(final Config config) {
// phase 1: create a domainClassType for each ObjectSpecification
// these are added into a map for lookups in phase 2
- final Map<ObjectSpecification, DomainClassDto> domainClassByObjectSpec = _Maps.newHashMap();
+ final Map<ObjectSpecification, DomainClassDto> domainClassByObjectSpec = new HashMap<>();
for (final ObjectSpecification specification : specificationLookup.snapshotSpecifications()) {
DomainClassDto domainClassType = asXsdType(specification, config);
domainClassByObjectSpec.put(specification, domainClassType);
@@ -116,7 +116,7 @@ MetamodelDto exportMetaModel(final Config config) {
}
// phase 2.5: check no duplicates
- final Map<String, ObjectSpecification> objectSpecificationByDomainClassId = _Maps.newHashMap();
+ final Map<String, ObjectSpecification> objectSpecificationByDomainClassId = new HashMap<>();
final List<String> buf = new ArrayList<>();
for (final Map.Entry<ObjectSpecification, DomainClassDto> entry : domainClassByObjectSpec.entrySet()) {
final ObjectSpecification objectSpecification = entry.getKey();
@@ -150,7 +150,7 @@ MetamodelDto exportMetaModel(final Config config) {
private MetamodelDto exportTinyDomain(final List<ObjectSpecification> tinyDomain, final Config config) {
MetamodelDto metamodelDto = new MetamodelDto();
- final Map<ObjectSpecification, DomainClassDto> domainClassByObjectSpec = _Maps.newHashMap();
+ final Map<ObjectSpecification, DomainClassDto> domainClassByObjectSpec = new HashMap<>();
for (final ObjectSpecification specification : tinyDomain) {
DomainClassDto domainClassType = asXsdType(specification, config);
domainClassByObjectSpec.put(specification, domainClassType);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
index 020846d0f2f..f0d3af9874e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -19,28 +19,27 @@
package org.apache.causeway.core.metamodel.services.registry;
import java.lang.annotation.Annotation;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.ioc.SingletonBeanProvider;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Default implementation of {@link ServiceRegistry}.
@@ -99,7 +98,7 @@ public void clearRegisteredBeans() {
_Lazy.threadSafe(this::enumerateContributingDomainServices);
private Map<String, SingletonBeanProvider> enumerateContributingDomainServices() {
- var managedBeanAdapterByName = _Maps.<String, SingletonBeanProvider>newHashMap();
+ var managedBeanAdapterByName = new HashMap<String, SingletonBeanProvider>();
causewaySystemEnvironment.springContextHolder()
.streamAllBeans()
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
index d339dd9efa1..51367de21f1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.metamodel.spec.feature;
import java.util.Comparator;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -29,7 +30,6 @@
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -227,7 +227,7 @@ public static boolean isInstanceOf(final Throwable throwable) {
public static <T extends ObjectMember> Map<String, T> mapById(final Stream<T> members) {
- var memberById = _Maps.<String, T>newLinkedHashMap();
+ var memberById = new LinkedHashMap<String, T>();
members.forEach(member->{
// if there are multiple members with same id, just disregard
memberById.put(member.getId(), member);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/LogicalTypeResolver.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/LogicalTypeResolver.java
index 7d2b93199b9..e9a8d1fa24d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/LogicalTypeResolver.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/LogicalTypeResolver.java
@@ -20,13 +20,13 @@
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-
import org.jspecify.annotations.NonNull;
+
import lombok.extern.slf4j.Slf4j;
/**
@@ -41,7 +41,7 @@ record LogicalTypeResolver(
Map<String, LogicalType> logicalTypeByName) {
LogicalTypeResolver() {
- this(_Maps.newConcurrentHashMap());
+ this(new ConcurrentHashMap<>());
}
/**
@@ -71,9 +71,8 @@ <T extends ObjectSpecification> T register(final @NonNull T spec) {
var logicalTypeName = spec.logicalTypeName();
- if(logicalTypeByName.containsKey(logicalTypeName)) {
- return spec;
- }
+ if(logicalTypeByName.containsKey(logicalTypeName))
+ return spec;
// collect concrete classes (do not collect abstract or anonymous types or interfaces)
if(!spec.isAbstract()
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/snapshot/XmlSnapshot.java
index ac51f46367e..2edeb403b7e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/snapshot/XmlSnapshot.java
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -39,7 +40,6 @@
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.codec._DocumentFactories;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet;
@@ -801,7 +801,7 @@ Place objectToElement(final ManagedObject adapter) {
return place;
}
- private final Map<ManagedObject, String> viewModelFakeOids = _Maps.newHashMap();
+ private final Map<ManagedObject, String> viewModelFakeOids = new HashMap<>();
private String oidAsString(final ManagedObject adapter) {
if (adapter.getPojo() instanceof ViewModel) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
index e00616cfb10..521007ffbb9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
@@ -20,16 +20,9 @@
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.jspecify.annotations.Nullable;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.ClassUtils;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
@@ -37,11 +30,15 @@
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.metamodel.valuesemantics.EnumValueSemantics;
+import org.jspecify.annotations.Nullable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ClassUtils;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
@Service
@@ -111,7 +108,7 @@ private <T> Stream<ValueSemanticsProvider<T>> streamEnumValueSemantics(final Cla
// managed by Causeway
@SuppressWarnings("rawtypes")
- private Map<Class<?>, ValueSemanticsProvider> enumSemantics = _Maps.newConcurrentHashMap();
+ private final Map<Class<?>, ValueSemanticsProvider> enumSemantics = new ConcurrentHashMap<>();
@SuppressWarnings("unchecked")
private <T extends Enum<T>> ValueSemanticsProvider<T> defaultEnumSemantics(final Class<T> enumType) {
diff --git a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
index c76aae6919f..d2345f20f5f 100644
--- a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
+++ b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -57,7 +58,6 @@
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.collections._Streams;
import org.apache.causeway.commons.internal.ioc.SingletonBeanProvider;
import org.apache.causeway.core.config.CausewayConfiguration;
@@ -515,7 +515,7 @@ private void registerAsService(final ServiceInstance serviceInstance) {
}
private final Map<String, ManagedObject> collectBeansOfKnownSort() {
- var map = _Maps.<String, ManagedObject>newLinkedHashMap();
+ var map = new LinkedHashMap<String, ManagedObject>();
// first pass: introspect them all
var services = getServiceRegistry()
diff --git a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/ServiceRegistry_forTesting.java b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/ServiceRegistry_forTesting.java
index 7bbbc19e255..09640a9ecad 100644
--- a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/ServiceRegistry_forTesting.java
+++ b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/ServiceRegistry_forTesting.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.mmtestsupport;
import java.lang.annotation.Annotation;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
@@ -33,7 +34,6 @@
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.ioc.SingletonBeanProvider;
@@ -82,7 +82,7 @@ public <T> Can<T> select(final Class<T> type, final Annotation[] qualifiers) {
return Can.empty();
}
- private final Map<String, SingletonBeanProvider> registeredBeanById = _Maps.newHashMap();
+ private final Map<String, SingletonBeanProvider> registeredBeanById = new HashMap<>();
@Override
public Stream<SingletonBeanProvider> streamRegisteredBeans() {
diff --git a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/_ServiceInjectorLegacy.java b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/_ServiceInjectorLegacy.java
index 087dea082dc..c42dd483a82 100644
--- a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/_ServiceInjectorLegacy.java
+++ b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/_ServiceInjectorLegacy.java
@@ -26,17 +26,10 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Inject;
-
-import org.jspecify.annotations.NonNull;
-
-import org.springframework.beans.factory.InjectionPoint;
-import org.springframework.core.MethodParameter;
-
import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
@@ -44,12 +37,16 @@
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.collections._Collections;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.reflection._Generics;
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.commons.ToString;
+import org.jspecify.annotations.NonNull;
+import org.springframework.beans.factory.InjectionPoint;
+import org.springframework.core.MethodParameter;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@@ -60,8 +57,8 @@ final class _ServiceInjectorLegacy implements ServiceInjector {
@Inject private ServiceRegistry serviceRegistry;
@Inject private _InjectorMethodEvaluator injectorMethodEvaluator;
- private final Map<Class<?>, Method[]> methodsByClassCache = _Maps.newConcurrentHashMap();
- private final Map<Class<?>, Field[]> fieldsByClassCache = _Maps.newConcurrentHashMap();
+ private final Map<Class<?>, Method[]> methodsByClassCache = new ConcurrentHashMap<>();
+ private final Map<Class<?>, Field[]> fieldsByClassCache = new ConcurrentHashMap<>();
@Override
public <T> T injectServicesInto(final T domainObject) {
@@ -130,9 +127,8 @@ private void injectToField(final Object targetPojo,
final Class<?> typeToBeInjected = field.getType();
// don't think that type can ever be null,
// but Javadoc for java.lang.reflect.Field doesn't say
- if(typeToBeInjected == null) {
- return;
- }
+ if(typeToBeInjected == null)
+ return;
// inject matching services into a field of type Collection<T> if a generic type T is present
final Class<?> elementType = inferElementType(field)
@@ -226,9 +222,8 @@ private void injectIntoSetter(
final Consumer<InjectionPoint> onNotResolvable) {
final Class<?> typeToBeInjected = injectorMethodEvaluator.getTypeToBeInjected(setter);
- if(typeToBeInjected == null) {
- return;
- }
+ if(typeToBeInjected == null)
+ return;
var instance = serviceRegistry.select(typeToBeInjected, setter.getAnnotations());
if(instance.isCardinalityOne()) {
@@ -249,11 +244,10 @@ private static void invokeMethod(final Method method, final Object target, final
throw new MetaModelException(e1);
} catch (final InvocationTargetException e) {
final Throwable targetException = e.getTargetException();
- if (targetException instanceof RuntimeException) {
- throw (RuntimeException) targetException;
- } else {
- throw new MetaModelException(targetException);
- }
+ if (targetException instanceof RuntimeException)
+ throw (RuntimeException) targetException;
+ else
+ throw new MetaModelException(targetException);
}
}
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoReader.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoReader.java
index 42fba175a4d..b8807692b95 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoReader.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoReader.java
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -32,7 +33,6 @@
import org.apache.causeway.applib.services.i18n.TranslationsResolver;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.collections._Sets;
import lombok.extern.slf4j.Slf4j;
@@ -43,8 +43,8 @@ class PoReader extends PoAbstract {
public static final String DASH = "-";
public static final String UNDERSCORE = "_";
- private final Map<Locale, Map<ContextAndMsgId, String>> translationByKeyByLocale = _Maps.newHashMap();
- private final Map<Locale, Boolean> usesFallbackByLocale = _Maps.newHashMap();
+ private final Map<Locale, Map<ContextAndMsgId, String>> translationByKeyByLocale = new HashMap<>();
+ private final Map<Locale, Boolean> usesFallbackByLocale = new HashMap<>();
/**
* The basename of the translations file, hard-coded to <tt>translations</tt>.
@@ -170,7 +170,7 @@ private Map<ContextAndMsgId, String> readAndCacheTranslationsIfRequired(final Lo
if(translationsByKey != null)
return translationsByKey;
- translationsByKey = _Maps.newHashMap();
+ translationsByKey = new HashMap<>();
read(locale, translationsByKey);
translationByKeyByLocale.put(locale, translationsByKey);
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoWriter.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoWriter.java
index 2a722ab0632..9aa28f57708 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoWriter.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/PoWriter.java
@@ -23,11 +23,11 @@
import java.util.Locale;
import java.util.SortedMap;
import java.util.SortedSet;
+import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.causeway.applib.services.i18n.Mode;
import org.apache.causeway.applib.services.i18n.TranslationContext;
-import org.apache.causeway.commons.internal.collections._Maps;
import lombok.extern.slf4j.Slf4j;
@@ -41,7 +41,7 @@ private static class Block {
private Block() { }
}
- private final SortedMap<String, Block> blocksByMsgId = _Maps.newTreeMap();
+ private final SortedMap<String, Block> blocksByMsgId = new TreeMap<>();
public PoWriter(final TranslationServicePo translationServicePo) {
super(translationServicePo, Mode.WRITE);
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
index 5ffddf3a18c..b06507277ef 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
@@ -19,10 +19,12 @@
package org.apache.causeway.core.runtimeservices.menubars.bootstrap;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.function.Predicate;
import java.util.stream.Stream;
@@ -41,7 +43,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
@@ -162,7 +163,7 @@ private BSMenuBars loadOrElse(
}
private BSMenuBars updateFacetsFromActionLayoutXml(final BSMenuBars menuBarsFromXml) {
- final Map<String, ServiceActionLayoutData> serviceActionLayoutDataByActionId = _Maps.newHashMap();
+ final Map<String, ServiceActionLayoutData> serviceActionLayoutDataByActionId = new HashMap<>();
menuBarsFromXml.visit(serviceActionLayoutData->
serviceActionLayoutDataByActionId.put(
serviceActionLayoutData.getLogicalTypeNameAndId(),
@@ -379,7 +380,7 @@ private static Set<String> serviceNamesInOrder(
*/
private static Map<String, List<ServiceAndAction>> groupByServiceName(
final List<ServiceAndAction> serviceActions) {
- var serviceActionsByName = _Maps.<String, List<ServiceAndAction>>newTreeMap();
+ var serviceActionsByName = new TreeMap<String, List<ServiceAndAction>>();
// map available services
ManagedObject lastServiceAdapter = null;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java
index 55edd04347f..5c2e338adea 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java
@@ -18,19 +18,18 @@
*/
package org.apache.causeway.core.runtimeservices.scratchpad;
+import java.util.HashMap;
import java.util.Map;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.scratchpad.Scratchpad;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
/**
* Default implementation of {@link Scratchpad}, which simply stores data in-memory.
@@ -53,13 +52,13 @@ public class ScratchpadDefault implements Scratchpad {
* Provides a mechanism for each object being acted upon to pass
* data to the next object.
*/
- private final Map<Object, Object> userData = _Maps.newHashMap();
+ private final Map<Object, Object> userData = new HashMap<>();
/**
* Obtain user-data, as set by a previous object being acted upon.
*/
@Override
- public Object get(Object key) {
+ public Object get(final Object key) {
return userData.get(key);
}
@@ -67,7 +66,7 @@ public Object get(Object key) {
* Set user-data, for the use of a subsequent object being acted upon.
*/
@Override
- public void put(Object key, Object value) {
+ public void put(final Object key, final Object value) {
userData.put(key, value);
}
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
index 6baf989289a..70d4a553ad2 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
@@ -21,15 +21,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.jspecify.annotations.Nullable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.exceptions.unrecoverable.NoAuthenticatorException;
@@ -40,15 +32,21 @@
import org.apache.causeway.applib.util.ToString;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Timing;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.Authenticator;
import org.apache.causeway.core.security.authentication.standard.RandomCodeGenerator;
import org.apache.causeway.core.security.authentication.standard.Registrar;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.Getter;
-import org.jspecify.annotations.NonNull;
@Service
@Named(AuthenticationManager.LOGICAL_TYPE_NAME)
@@ -60,7 +58,7 @@ public class AuthenticationManager {
@Getter private final @NonNull Can<Authenticator> authenticators;
- private final Map<String, String> userByValidationCode = _Maps.newConcurrentHashMap();
+ private final Map<String, String> userByValidationCode = new ConcurrentHashMap<>();
private final @NonNull InteractionService interactionService;
private final @NonNull RandomCodeGenerator randomCodeGenerator;
private final @NonNull Can<Registrar> registrars;
@@ -79,9 +77,8 @@ public AuthenticationManager(
this.authenticators = Can.ofCollection(authenticators);
this.userCurrentSessionTimeZoneHolder = userCurrentSessionTimeZoneHolder;
this.userMementoRefiners = userMementoRefiners;
- if (this.authenticators.isEmpty()) {
- throw new NoAuthenticatorException("No authenticators specified");
- }
+ if (this.authenticators.isEmpty())
+ throw new NoAuthenticatorException("No authenticators specified");
this.registrars = this.authenticators
.filter(Registrar.class::isInstance)
.map(Registrar.class::cast);
@@ -93,17 +90,15 @@ public AuthenticationManager(
// cannot use final here, as Spring provides a transaction aware proxy for this type
public /*final*/ InteractionContext authenticate(final AuthenticationRequest request) {
- if (request == null) {
- return null;
- }
+ if (request == null)
+ return null;
var compatibleAuthenticators = authenticators
.filter(authenticator->authenticator.canAuthenticate(request.getClass()));
- if (compatibleAuthenticators.isEmpty()) {
- throw new NoAuthenticatorException(
+ if (compatibleAuthenticators.isEmpty())
+ throw new NoAuthenticatorException(
"No authenticator available for processing " + request.getClass().getName());
- }
// open a new anonymous interaction for this loop to run in
// we simply participate with the current transaction
@@ -143,10 +138,9 @@ private String getUnusedRandomCode() {
do {
// guard against infinite loop when unique code generation for some reason fails
- if(stopWatch.getMillis()>3000L) {
- throw new NoAuthenticatorException(
+ if(stopWatch.getMillis()>3000L)
+ throw new NoAuthenticatorException(
"RandomCodeGenerator failed to produce a unique code within 3s.");
- }
code = randomCodeGenerator.generateRandomCode();
} while (userByValidationCode.containsKey(code));
@@ -156,16 +150,13 @@ private String getUnusedRandomCode() {
// cannot use final here, as Spring provides a transaction aware proxy for this type
public /*final*/ boolean isSessionValid(final @Nullable InteractionContext interactionContext) {
- if(interactionContext==null) {
- return false;
- }
+ if(interactionContext==null)
+ return false;
var userMemento = interactionContext.getUser();
- if(userMemento.authenticationSource().isExternal()) {
- return true;
- }
- if(userMemento.isImpersonating()) {
- return true;
- }
+ if(userMemento.authenticationSource().isExternal())
+ return true;
+ if(userMemento.isImpersonating())
+ return true;
final String userName = userByValidationCode.get(userMemento.authenticationCode());
return interactionContext.getUser().isCurrentUser(userName);
}
@@ -182,18 +173,16 @@ public void closeSession(final @Nullable UserMemento user) {
public boolean register(final RegistrationDetails registrationDetails) {
for (var registrar : this.registrars) {
- if (registrar.canRegister(registrationDetails.getClass())) {
- return registrar.register(registrationDetails);
- }
+ if (registrar.canRegister(registrationDetails.getClass()))
+ return registrar.register(registrationDetails);
}
return false;
}
public boolean supportsRegistration(final Class<? extends RegistrationDetails> registrationDetailsClass) {
for (var registrar : this.registrars) {
- if (registrar.canRegister(registrationDetailsClass)) {
- return true;
- }
+ if (registrar.canRegister(registrationDetailsClass))
+ return true;
}
return false;
}
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
index 21eb852923f..59e8c2fe164 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
@@ -24,19 +24,11 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.confview.ConfigurationProperty;
import org.apache.causeway.applib.services.confview.ConfigurationViewService;
@@ -45,15 +37,21 @@
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayConfiguration.Core.Config.ConfigurationPropertyVisibilityPolicy;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.util.ValueMaskingUtil;
import org.apache.causeway.core.webapp.modules.WebModule;
-
import org.jspecify.annotations.NonNull;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -124,7 +122,7 @@ public String toStringFormatted() {
// -- HELPER
- private _Lazy<List<Map<String, ConfigurationProperty>>> scopedConf = _Lazy.threadSafe(()->loadConfiguration());
+ private final _Lazy<List<Map<String, ConfigurationProperty>>> scopedConf = _Lazy.threadSafe(this::loadConfiguration);
private List<Map<String, ConfigurationProperty>> loadConfiguration() {
var configCategories =
@@ -154,7 +152,7 @@ private List<Map<String, ConfigurationProperty>> loadConfiguration() {
}
private Map<String, ConfigurationProperty> loadEnvironment() {
- final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
+ final Map<String, ConfigurationProperty> map = new TreeMap<>();
add("Causeway Version", configuration.viewer().common().application().version(), map);
add("Deployment Type", systemEnvironment.deploymentType().name(), map);
//add("Unit Testing", ""+systemEnvironment.isUnitTesting(), map);
@@ -185,7 +183,7 @@ private Map<String, ConfigurationProperty> loadEnvironment() {
}
private Map<String, ConfigurationProperty> loadPrimary(final List<String> primaryPrefixes) {
- final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
+ final Map<String, ConfigurationProperty> map = new TreeMap<>();
if(isShowConfigurationProperties()) {
configuration.streamConfigurationPropertyNames()
.filter(propName->primaryPrefixes.stream().anyMatch(propName::startsWith))
@@ -213,7 +211,7 @@ private Map<String, ConfigurationProperty> loadPrimary(final List<String> primar
}
private Map<String, ConfigurationProperty> loadSecondary(final Set<String> toBeExcluded) {
- final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
+ final Map<String, ConfigurationProperty> map = new TreeMap<>();
if(isShowConfigurationProperties()) {
configuration.streamConfigurationPropertyNames()
.filter(propName->!toBeExcluded.contains(propName))
@@ -232,7 +230,7 @@ private Map<String, ConfigurationProperty> loadSecondary(final Set<String> toBeE
return map;
}
- private static void logRetrievalFailure(final String propName, Throwable error) {
+ private static void logRetrievalFailure(final String propName, final Throwable error) {
log.warn("failed to load configuration property '{}'", propName, error);
}
@@ -246,16 +244,12 @@ private static void addSystemProperty(final String key, final Map<String, Config
}
private boolean isShowConfigurationProperties() {
- switch (getConfigurationPropertyVisibilityPolicy()) {
- case NEVER_SHOW:
- return false;
- case SHOW_ONLY_IN_PROTOTYPE:
- return systemEnvironment.deploymentType().isPrototyping();
- case ALWAYS_SHOW:
- return true;
- default:
- return false;
- }
+ return switch (getConfigurationPropertyVisibilityPolicy()) {
+ case NEVER_SHOW -> false;
+ case SHOW_ONLY_IN_PROTOTYPE -> systemEnvironment.deploymentType().isPrototyping();
+ case ALWAYS_SHOW -> true;
+ default -> false;
+ };
}
private ConfigurationPropertyVisibilityPolicy getConfigurationPropertyVisibilityPolicy() {
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
index 8a121b88413..d5a00664191 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
@@ -25,6 +25,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -39,7 +40,6 @@
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -394,7 +394,7 @@ private <T> List<T> fromWorkbook(
final Sheet sheet = lookupSheet(cls, sheetName, workbook);
boolean header = true;
- final Map<Integer, Property> propertyByColumn = _Maps.newHashMap();
+ final Map<Integer, Property> propertyByColumn = new HashMap<>();
final ObjectSpecification objectSpec = specificationLoader.specForType(cls).orElse(null);
diff --git a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
index 2f21ad591e4..c663d968505 100644
--- a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
+++ b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -35,7 +36,6 @@
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
@@ -139,7 +139,7 @@ public String getQualifiedName() {
* Output: the objects created by this fixture, for a specific persistable/row handler class.
*/
@Getter
- private final Map<Class<?>, List<Object>> objectsByClass = _Maps.newHashMap();
+ private final Map<Class<?>, List<Object>> objectsByClass = new HashMap<>();
@Override
protected void execute(final ExecutionContext ec) {
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
index 4f9b8140373..b7ac3d8104f 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
@@ -18,19 +18,11 @@
*/
package org.apache.causeway.extensions.secman.integration.authorizor;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
@@ -38,7 +30,6 @@
import org.apache.causeway.applib.services.iactn.InteractionContext;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.security.authentication.logout.LogoutMenu;
import org.apache.causeway.core.security.authorization.Authorizor;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
@@ -46,8 +37,15 @@
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
-
import org.jspecify.annotations.NonNull;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
/**
* @since 2.0 {@index}
@@ -62,7 +60,7 @@ public class AuthorizorSecman implements Authorizor {
@Inject Provider<PermissionCache> cache;
@Inject MetaModelService metaModelService;
- private _Lazy<Identifier> logoutIdentifier = _Lazy.threadSafe(this::logoutIdentifier);
+ private final _Lazy<Identifier> logoutIdentifier = _Lazy.threadSafe(this::logoutIdentifier);
private Identifier logoutIdentifier() {
return Identifier.actionIdentifier(metaModelService.lookupLogicalTypeByClass(LogoutMenu.class).orElseThrow(), "logout");
@@ -70,17 +68,15 @@ private Identifier logoutIdentifier() {
@Override
public boolean isVisible(final InteractionContext authentication, final Identifier identifier) {
- if (this.logoutIdentifier.get().equals(identifier)) {
- return true;
- }
+ if (this.logoutIdentifier.get().equals(identifier))
+ return true;
return grants(authentication, identifier, ApplicationPermissionMode.VIEWING);
}
@Override
public boolean isUsable(final InteractionContext authentication, final Identifier identifier) {
- if (this.logoutIdentifier.get().equals(identifier)) {
- return true;
- }
+ if (this.logoutIdentifier.get().equals(identifier))
+ return true;
return grants(authentication, identifier, ApplicationPermissionMode.CHANGING);
}
@@ -110,7 +106,7 @@ private boolean grants(
@InteractionScope
static class PermissionCache implements DisposableBean {
- private final Map<String, Optional<ApplicationPermissionValueSet>> permissionsByUsername = _Maps.newHashMap();
+ private final Map<String, Optional<ApplicationPermissionValueSet>> permissionsByUsername = new HashMap<>();
@Override
public void destroy() {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
index 1a7904b7818..82641f352ca 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
@@ -21,6 +21,7 @@
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
@@ -28,7 +29,6 @@
import java.util.stream.Collectors;
import org.apache.causeway.applib.services.iactn.InteractionContext;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
@@ -42,7 +42,7 @@ public abstract class EventProviderAbstract implements EventProvider {
private static final long serialVersionUID = 1L;
- private final Map<String, Event> eventById = _Maps.newLinkedHashMap();
+ private final Map<String, Event> eventById = new LinkedHashMap<>();
// //////////////////////////////////////
@@ -83,9 +83,8 @@ private Object dereference(final MetaModelContext commonContext, final Object do
for (final CalendarableDereferencingService dereferencingService : services) {
final Object dereferencedObject = dereferencingService.dereference(domainObject);
if (dereferencedObject != null
- && dereferencedObject != domainObject) {
- return dereferencedObject;
- }
+ && dereferencedObject != domainObject)
+ return dereferencedObject;
}
return domainObject;
}
@@ -98,9 +97,8 @@ private Function<ManagedObject, Event> newEvent(
final Object domainObjectPojo = domainObject.getPojo();
final CalendarEvent calendarEvent = calendarEventFor(domainObjectPojo, calendarName);
- if(calendarEvent == null) {
- return null;
- }
+ if(calendarEvent == null)
+ return null;
var timeZone = commonContext.getInteractionService()
.currentInteractionContext()
@@ -139,9 +137,8 @@ private Function<ManagedObject, Event> newEvent(
return event;
- } else {
- return null;
- }
+ } else
+ return null;
};
}
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
index 3b2765872a2..2eeb6ee44fb 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
@@ -24,6 +24,7 @@
import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -34,22 +35,6 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
-
-import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.core.Ordered;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.EntityChangeKind;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
@@ -88,7 +73,20 @@
import org.apache.causeway.schema.chg.v2.ChangesDto;
import org.apache.causeway.schema.chg.v2.ObjectsDto;
import org.apache.causeway.schema.common.v2.OidsDto;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.core.Ordered;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -157,7 +155,7 @@ public int getOrder() {
* cannot use <code>newConcurrentHashMap</code> as this doesn't preserve insertion order; instead we
* make sure that it is only ever accessed within a <code>synchronized</code> block.
*/
- private final Map<PropertyChangeRecordId, PropertyChangeRecord> enlistedPropertyChangeRecordsById = _Maps.newLinkedHashMap();
+ private final Map<PropertyChangeRecordId, PropertyChangeRecord> enlistedPropertyChangeRecordsById = new LinkedHashMap<>();
/**
* As used when {@link #enlistCreated(ManagedObject)} or {@link #enlistUpdating(ManagedObject, Function)}
@@ -253,7 +251,7 @@ private Changes memoizeChangesIfRequired() {
/**
* @implNote access to this {@link Map} must be thread-safe (insertion order preservation is not required)
*/
- private final Map<Bookmark, EntityChangeKind> changeKindByEnlistedAdapter = _Maps.newHashMap();
+ private final Map<Bookmark, EntityChangeKind> changeKindByEnlistedAdapter = new HashMap<>();
private final LongAdder numberEntitiesLoaded = new LongAdder();
private final LongAdder entityChangeEventCount = new LongAdder();
@@ -304,23 +302,19 @@ private boolean shouldPublish(final PreAndPostValue preAndPostValue) {
private boolean isEntityExcludedForChangePublishing(final ManagedObject entity) {
- if (!configuration.isEnabled()) {
+ if (!configuration.isEnabled())
return true;
- }
- if(!EntityChangePublishingFacet.isPublishingEnabled(entity.objSpec())) {
+ if(!EntityChangePublishingFacet.isPublishingEnabled(entity.objSpec()))
return true; // ignore entities that are not enabled for entity change publishing
- }
// guard against transient
- if(ManagedObjects.bookmark(entity).isEmpty()) {
+ if(ManagedObjects.bookmark(entity).isEmpty())
return true;
- }
- if(changes.isMemoized()) {
+ if(changes.isMemoized())
throw _Exceptions.illegalState("Cannot enlist additional changes for auditing, "
+ "since changedObjectPropertiesRef was already prepared (memoized) for auditing.");
- }
return false;
}
@@ -353,15 +347,12 @@ public void afterCompletion(final int status) {
}
private static String decodeStatus(final int status) {
- if (status == STATUS_COMMITTED) {
+ if (status == STATUS_COMMITTED)
return "STATUS_COMMITTED";
- }
- if (status == STATUS_ROLLED_BACK) {
+ if (status == STATUS_ROLLED_BACK)
return "STATUS_ROLLED_BACK";
- }
- if (status == STATUS_UNKNOWN) {
+ if (status == STATUS_UNKNOWN)
return "STATUS_UNKNOWN";
- }
return status + " [not recognised]";
}
@@ -376,9 +367,8 @@ public Optional<EntityChanges> getEntityChanges(
// a defensive copy of
var changeKindByEnlistedAdapter = new HashMap<>(this.changeKindByEnlistedAdapter);
- if(changeKindByEnlistedAdapter.isEmpty()) {
+ if(changeKindByEnlistedAdapter.isEmpty())
return Optional.empty();
- }
final var interactionCarrier = interactionCarrier();
final int numberEntitiesLoaded1 = numberEntitiesLoaded();
@@ -421,9 +411,8 @@ private static ChangesDto newDto(
changeKindByEnlistedEntity.forEach((bookmark, kind)->{
var oidDto = bookmark.toOidDto();
- if(oidDto==null) {
+ if(oidDto==null)
return;
- }
switch(kind) {
case CREATE:
objectsDto.getCreated().getOid().add(oidDto);
@@ -480,7 +469,8 @@ private InteractionCarrier interactionCarrier() {
// -- HELPER
/**
- * @return <code>true</code> if successfully enlisted, <code>false</code> if not (no longer) enlisted ... eg delete of an entity that was created earlier in the transaction
+ * @return <code>true</code> if successfully enlisted, <code>false</code> if not (no longer) enlisted
+ * ... eg delete of an entity that was created earlier in the transaction
*/
private boolean enlistForChangeKindPublishing(
final @NonNull ManagedObject entity,
@@ -496,30 +486,24 @@ private boolean enlistForChangeKindPublishing(
changeKindByEnlistedAdapter.put(bookmark, changeKind);
return true;
}
- switch (previousChangeKind) {
- case CREATE:
- switch (changeKind) {
- case DELETE:
- changeKindByEnlistedAdapter.remove(bookmark);
- case CREATE:
- case UPDATE:
- return false;
- }
- break;
- case UPDATE:
- switch (changeKind) {
- case DELETE:
- changeKindByEnlistedAdapter.put(bookmark, changeKind);
- return true;
- case CREATE:
- case UPDATE:
- return false;
- }
- break;
- case DELETE:
- return false;
- }
- return false;
+ return switch (previousChangeKind) {
+ case CREATE ->
+ switch (changeKind) {
+ case DELETE -> {
+ changeKindByEnlistedAdapter.remove(bookmark);
+ yield false;
+ }
+ case CREATE, UPDATE -> false;
+ };
+ case UPDATE -> switch (changeKind) {
+ case DELETE -> {
+ changeKindByEnlistedAdapter.put(bookmark, changeKind);
+ yield true;
+ }
+ case CREATE, UPDATE -> false;
+ };
+ case DELETE -> false;
+ };
}
// side-effect free, used by XRay
@@ -535,9 +519,8 @@ public void enlistCreated(final ManagedObject entity) {
_Xray.enlistCreated(entity, interactionTrackerProvider);
if (isEntityExcludedForChangePublishing(entity)
- || !EntityChangePublishingFacet.isPublishingEnabledForCreate(entity.objSpec())) {
+ || !EntityChangePublishingFacet.isPublishingEnabledForCreate(entity.objSpec()))
return;
- }
log.debug("enlist entity's property changes for publishing {}", entity);
@@ -557,9 +540,8 @@ public void enlistUpdating(
_Xray.enlistUpdating(entity, interactionTrackerProvider);
if (isEntityExcludedForChangePublishing(entity)
- || !EntityChangePublishingFacet.isPublishingEnabledForUpdate(entity.objSpec())) {
+ || !EntityChangePublishingFacet.isPublishingEnabledForUpdate(entity.objSpec()))
return;
- }
if(log.isDebugEnabled()) {
log.debug("enlist entity's property changes for publishing {}", entity);
@@ -595,9 +577,8 @@ public void enlistDeleting(final ManagedObject entity) {
_Xray.enlistDeleting(entity, interactionTrackerProvider);
if (isEntityExcludedForChangePublishing(entity)
- || !EntityChangePublishingFacet.isPublishingEnabledForDelete(entity.objSpec())) {
+ || !EntityChangePublishingFacet.isPublishingEnabledForDelete(entity.objSpec()))
return;
- }
suppressAutoFlushIfRequired(() -> {
final boolean enlisted = enlistForChangeKindPublishing(entity, EntityChangeKind.DELETE);
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
index 88978809ddc..ca99e5c7d91 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
@@ -20,18 +20,15 @@
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-
+import org.apache.causeway.commons.collections.Can;
import org.jspecify.annotations.NonNull;
-
import org.springframework.stereotype.Service;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Maps;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -45,8 +42,8 @@ public class KVStoreForTesting {
@PostConstruct
public void init() {
log.info("about to initialize");
- keyValueMap = _Maps.newConcurrentHashMap();
- latchMap = _Maps.newConcurrentHashMap();
+ keyValueMap = new ConcurrentHashMap<>();
+ latchMap = new ConcurrentHashMap<>();
}
@PreDestroy
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
index 18652f66151..8facda33ce7 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
@@ -20,20 +20,19 @@
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.io.TextUtils;
/**
@@ -59,7 +58,7 @@ public ExecutionParametersDefault(final String parameters) {
}
static Map<String, String> asKeyValueMap(final String parameters) {
- final Map<String, String> keyValues = _Maps.newLinkedHashMap();
+ final Map<String, String> keyValues = new LinkedHashMap<>();
if (parameters != null) {
try {
TextUtils.streamLines(parameters)
@@ -131,108 +130,96 @@ protected Object getParameterAsObject(final String parameterName, final Class<?>
@Override
public Boolean getParameterAsBoolean(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Boolean.valueOf(value);
}
@Override
public Byte getParameterAsByte(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Byte.valueOf(value);
}
@Override
public Short getParameterAsShort(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Short.valueOf(value);
}
@Override
public Integer getParameterAsInteger(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Integer.valueOf(value);
}
@Override
public Long getParameterAsLong(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Long.valueOf(value);
}
@Override
public Float getParameterAsFloat(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Float.valueOf(value);
}
@Override
public Double getParameterAsDouble(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Double.valueOf(value);
}
@Override
public Character getParameterAsCharacter(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return Character.valueOf(value.charAt(0));
}
@Override
public BigInteger getParameterAsBigInteger(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return new BigInteger(value);
}
@Override
public BigDecimal getParameterAsBigDecimal(final String parameterName) {
final String value = getParameter(parameterName);
- if (_Strings.isNullOrEmpty(value)) {
- return null;
- }
+ if (_Strings.isNullOrEmpty(value))
+ return null;
return new BigDecimal(value);
}
@Override
public LocalDate getParameterAsLocalDate(final String parameterName) {
final String value = getParameter(parameterName);
- if (value == null) {
- return null;
- }
+ if (value == null)
+ return null;
return LocalDate.parse(value);
}
@Override
public LocalDateTime getParameterAsLocalDateTime(final String parameterName) {
final String value = getParameter(parameterName);
- if (value == null) {
- return null;
- }
+ if (value == null)
+ return null;
return LocalDateTime.parse(value);
}
@@ -243,14 +230,12 @@ public <T extends Enum<T>> T getParameterAsEnum(final String parameterName, fina
}
private static <T extends Enum<T>> T valueOfElseNull(final Class<T> enumClass, final String value) {
- if (value == null) {
- return null;
- }
+ if (value == null)
+ return null;
final T[] enumConstants = enumClass.getEnumConstants();
for (T enumConstant : enumConstants) {
- if (enumConstant.name().equals(value)) {
- return enumConstant;
- }
+ if (enumConstant.name().equals(value))
+ return enumConstant;
}
return null;
}
@@ -262,17 +247,14 @@ public Map<String, String> getParameterMap() {
@Override
public void setParameterIfNotPresent(final String parameterName, final String parameterValue) {
- if (parameterName == null) {
- throw new IllegalArgumentException("parameterName required");
- }
- if (parameterValue == null) {
- // ignore
+ if (parameterName == null)
+ throw new IllegalArgumentException("parameterName required");
+ if (parameterValue == null)
+ // ignore
return;
- }
- if (parameterMap.containsKey(parameterName)) {
- // ignore; the existing parameter take precedence
+ if (parameterMap.containsKey(parameterName))
+ // ignore; the existing parameter take precedence
return;
- }
parameterMap.put(parameterName, parameterValue);
}
@@ -363,13 +345,11 @@ public void setParameter(final String parameterName, final Enum<?> parameterValu
@Override
public void setParameter(final String parameterName, final String parameterValue) {
- if (parameterName == null) {
- throw new IllegalArgumentException("parameterName required");
- }
- if (parameterValue == null) {
- // ignore
+ if (parameterName == null)
+ throw new IllegalArgumentException("parameterName required");
+ if (parameterValue == null)
+ // ignore
return;
- }
parameterMap.put(parameterName, parameterValue);
}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResultList.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResultList.java
index 741b0ee5178..e0b28ce2942 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResultList.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResultList.java
@@ -20,12 +20,12 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
/**
* Collecting parameter.
@@ -72,7 +72,7 @@ public class FixtureResultList {
*/
private final List<FixtureScript> fixtureScriptList = new ArrayList<>();
- private final Map<String, FixtureResult> fixtureResultByKey = _Maps.newHashMap();
+ private final Map<String, FixtureResult> fixtureResultByKey = new HashMap<>();
public <T> T add(final FixtureScript script, final T object) {
return add(script, nextItemFor(script), object);
@@ -106,7 +106,7 @@ public List<FixtureResult> getResults() {
// -- nextItemFor
- private final Map<FixtureScript, AtomicInteger> itemNumberByScript = _Maps.newHashMap();
+ private final Map<FixtureScript, AtomicInteger> itemNumberByScript = new HashMap<>();
String nextItemFor(final FixtureScript script) {
AtomicInteger atomicInteger = itemNumberByScript.get(script);
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 2929209483c..da21ebf19c5 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -28,6 +28,8 @@
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -46,7 +48,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
@@ -669,20 +670,20 @@ public List<FixtureScript> getPreviouslyExecuted() {
* used and populated only if the {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_CLASS}
* strategy is in use.
*/
- private final Map<Class<? extends FixtureScript>, FixtureScript> fixtureScriptByClass = _Maps.newLinkedHashMap();
+ private final Map<Class<? extends FixtureScript>, FixtureScript> fixtureScriptByClass = new LinkedHashMap<>();
/**
* used and populated only if the {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE}
* strategy is in use.
*/
- private final Map<FixtureScript, FixtureScript> fixtureScriptByValue = _Maps.newLinkedHashMap();
+ private final Map<FixtureScript, FixtureScript> fixtureScriptByValue = new LinkedHashMap<>();
static int roundup(final int n, final int roundTo) {
return ((n / roundTo) + 1) * roundTo;
}
@Getter @Setter
- private Map<Class<?>, Object> userData = _Maps.newHashMap();
+ private Map<Class<?>, Object> userData = new HashMap<>();
@Programmatic
public <T> T clearUserData(final Class<T> cls) {
return _Casts.uncheckedCast(userData.remove(cls));
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 11f8911d05c..205c3705a3e 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -271,7 +271,7 @@ public FixtureScripts(
throw new RuntimeException(String.format("Two FixtureScript's have the same friendly name '%s", v1));
},
TreeMap::new))
- : _Maps.newTreeMap();
+ : new TreeMap<>();
}
// -- runFixtureScript (using choices as the drop-down policy)
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java
index 84fe2d92080..f0abd08988c 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java
@@ -19,10 +19,10 @@
package org.apache.causeway.testing.integtestsupport.applib;
import java.util.ArrayList;
+import java.util.TreeMap;
import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.io.TextUtils;
import org.approvaltests.core.Options;
import org.approvaltests.core.Scrubber;
@@ -82,7 +82,7 @@ private String scrubLine(final String line) {
chunks.add(line.substring(0, p-1)); // first chunk "...<mml:param"
// ordered attributes
- var attrs = _Maps.<String, _Strings.KeyValuePair>newTreeMap();
+ var attrs = new TreeMap<String, _Strings.KeyValuePair>();
_Strings.splitThenStream(line.substring(p, q), " ")
.map(attrLiteral->
_Strings.parseKeyValuePair(attrLiteral, '=')
diff --git a/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index f3a5e371244..8bdd1066a25 100644
--- a/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -19,15 +19,14 @@
package org.apache.causeway.testing.specsupport.applib.integration;
import java.lang.reflect.Constructor;
+import java.util.HashMap;
import java.util.Map;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.commons.internal.collections._Maps;
-
-import lombok.RequiredArgsConstructor;
import io.cucumber.core.backend.ObjectFactory;
import io.cucumber.core.exception.CucumberException;
+import lombok.RequiredArgsConstructor;
/**
* @since 2.0 {@index}
@@ -36,7 +35,7 @@
public class ObjectFactoryForIntegration implements ObjectFactory {
private final ServiceInjector serviceInjector;
- private final Map<Class<?>, Object> instances = _Maps.newHashMap();
+ private final Map<Class<?>, Object> instances = new HashMap<>();
@Override
public void start() { }
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
index fb69435bc3a..1fa0906317d 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.soap;
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
+
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
-
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
/**
* Collection of SOAP endpoints that have been published; will automatically assign a unique address to any
@@ -48,9 +48,8 @@ public class SoapPublishedEndpoints {
* Lazily instantiates the singleton, using the {@link #INITIAL_PORT_DEFAULT default initial port}.
*/
public static SoapPublishedEndpoints instance() {
- if(instance == null) {
- return new SoapPublishedEndpoints();
- }
+ if(instance == null)
+ return new SoapPublishedEndpoints();
return instance;
}
@@ -85,19 +84,19 @@ public static void dispose() {
SoapPublishedEndpoints(){
this(INITIAL_PORT_DEFAULT);
}
- SoapPublishedEndpoints(int initialPort){
+ SoapPublishedEndpoints(final int initialPort){
this.initialPort = initialPort;
this.port = this.initialPort;
}
private final int initialPort;
private int port;
- private final Map<Class<?>, SoapEndpoint> soapEndpointByType = _Maps.newLinkedHashMap();
+ private final Map<Class<?>, SoapEndpoint> soapEndpointByType = new LinkedHashMap<>();
public SoapPublishedEndpoints publishIfRequired(final Class<?> endpointClass, final String endpointAddress) {
return publishIfRequired(new SoapEndpointSpec(endpointClass, endpointAddress));
}
- public SoapPublishedEndpoints publishIfRequired(Class<?>... endpointClasses) {
+ public SoapPublishedEndpoints publishIfRequired(final Class<?>... endpointClasses) {
var soapEndpointSpecs = stream(endpointClasses)
.map(SoapEndpointSpec::asSoapEndpointSpec)
.collect(Collectors.toCollection(ArrayList::new));
@@ -111,7 +110,7 @@ public SoapPublishedEndpoints publishIfRequired(final List<Class<?>> endpointCla
return publishIfRequired(soapEndpointSpecs);
}
- public SoapPublishedEndpoints publishIfRequired(SoapEndpointSpec... soapEndpointSpecs) {
+ public SoapPublishedEndpoints publishIfRequired(final SoapEndpointSpec... soapEndpointSpecs) {
var soapEndpointSpecs2 = stream(soapEndpointSpecs)
.collect(Collectors.toCollection(ArrayList::new));
return instance.publishIfRequired(soapEndpointSpecs2);
@@ -138,11 +137,11 @@ public SoapPublishedEndpoints publishEndpointIfRequired(final List<SoapEndpointS
return this;
}
- public String getEndpointAddress(Class<?> endpointClass) {
+ public String getEndpointAddress(final Class<?> endpointClass) {
return soapEndpointByType.get(endpointClass).getSpec().getEndpointAddress();
}
- public <T> T getEndpointImplementor(Class<T> endpointClass) {
+ public <T> T getEndpointImplementor(final Class<T> endpointClass) {
return _Casts.uncheckedCast( soapEndpointByType.get(endpointClass).getImplementor() );
}
}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNode.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNode.java
index 2bb9147ca52..5db0f155b84 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNode.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNode.java
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -28,7 +29,6 @@
import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
/**
@@ -84,7 +84,7 @@ public static PathNode parse(final String path) {
if (groupCount < 1)
return null;
final String key = nodeMatcher.group(1);
- final Map<String, String> criteria = _Maps.newHashMap();
+ final Map<String, String> criteria = new HashMap<>();
final String criteriaStr = nodeMatcher.group(3);
if (criteriaStr != null) {
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClientMediaType.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClientMediaType.java
index 0a3fa18116d..3126284ad68 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClientMediaType.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClientMediaType.java
@@ -19,18 +19,16 @@
package org.apache.causeway.viewer.restfulobjects.client;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.springframework.http.MediaType;
-
-import org.jspecify.annotations.Nullable;
-
import org.apache.causeway.applib.client.SuppressionType;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
+import org.jspecify.annotations.Nullable;
+import org.springframework.http.MediaType;
import lombok.RequiredArgsConstructor;
@@ -70,7 +68,7 @@ private static Map<String, String> headerMap(
final String urn,
final Class<?> dtoClass,
final EnumSet<SuppressionType> suppressionTypes) {
- var headerMap = _Maps.<String, String>newHashMap();
+ var headerMap = new HashMap<String, String>();
headerMap.put("profile", "\"urn:" + urn + "\"");
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index 55c96305577..0ff52a57627 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -19,11 +19,11 @@
package org.apache.causeway.viewer.restfulobjects.rendering;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -46,7 +46,7 @@ public abstract class ReprRendererAbstract<T>
private final LinkFollowSpecs linkFollower;
private final RepresentationType representationType;
protected final JsonRepresentation representation;
- private final Map<String,String> mediaTypeParams = _Maps.newLinkedHashMap();
+ private final Map<String,String> mediaTypeParams = new LinkedHashMap<>();
private final InteractionInitiatedBy interactionInitiatedBy;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index e55a87459dc..46a6d7a83c8 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -19,12 +19,12 @@
package org.apache.causeway.viewer.restfulobjects.rendering.domainobjects;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
@@ -119,7 +119,7 @@ private Object argValueFor(final int i) {
// PARAMETER DETAILS
private ObjectActionReprRenderer addParameterDetails() {
- final Map<String,Object> parameters = _Maps.newLinkedHashMap();
+ final Map<String,Object> parameters = new LinkedHashMap<>();
if(objectMember.getParameterCount()>0) {
var act = ManagedAction.of(objectAdapter, objectMember, Where.ANYWHERE);
var paramNeg = act.startParameterNegotiation();
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
index f848bbaf755..2a8bff00f71 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
@@ -23,6 +23,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -30,13 +31,9 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Component;
-
import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+import org.springframework.stereotype.Component;
import io.swagger.v3.oas.models.media.BooleanSchema;
import io.swagger.v3.oas.models.media.ByteArraySchema;
@@ -47,12 +44,13 @@
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.media.UUIDSchema;
+import jakarta.inject.Named;
@Component
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".ValueSchemaFactoryDefault")
public class ValueSchemaFactoryDefault implements ValueSchemaFactory {
- private final Map<Class<?>, Factory> propertyFactoryByClass = _Maps.newHashMap();
+ private final Map<Class<?>, Factory> propertyFactoryByClass = new HashMap<>();
private static interface Factory extends Supplier<Schema<?>> {}
@@ -103,9 +101,8 @@ public ValueSchemaFactoryDefault() {
@Override
public Optional<Schema<?>> schemaForValue(final Class<?> cls) {
- if(cls == null) {
- return Optional.empty();
- }
+ if(cls == null)
+ return Optional.empty();
// special case, want to treat as a value
if(cls.isEnum()) {
@@ -117,9 +114,8 @@ public Optional<Schema<?>> schemaForValue(final Class<?> cls) {
}
final Factory factory = propertyFactoryByClass.get(cls);
- if(factory != null) {
- return Optional.ofNullable(factory.get());
- }
+ if(factory != null)
+ return Optional.ofNullable(factory.get());
return Optional.empty();
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
index d91999c4e37..0049ab22edb 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
@@ -21,10 +21,10 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
@@ -67,7 +67,7 @@ enum DefaultFormat {
}
public static Map<Class<?>, JsonValueConverter> byClass() {
- var converterByClass = _Maps.<Class<?>, JsonValueConverter>newLinkedHashMap();
+ var converterByClass = new LinkedHashMap<Class<?>, JsonValueConverter>();
new _JsonValueConverters().asList()
.forEach(converter->converterByClass.put(converter.getValueClass(), converter));
return converterByClass;
diff --git a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
index fe5f6529646..2f9ee0d2a5a 100644
--- a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
+++ b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
@@ -18,9 +18,19 @@
*/
package org.apache.causeway.viewer.wicket.model.models.test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.applib.services.hint.HintStore;
+import org.apache.causeway.core.metamodel.context.MetaModelContext;
+import org.apache.causeway.core.mmtestsupport.MetaModelContext_forTesting;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -34,17 +44,6 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.applib.services.hint.HintStore;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import org.apache.causeway.core.mmtestsupport.MetaModelContext_forTesting;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -73,7 +72,7 @@ static class WicketAppStup
}
static class HintStore_forTesting implements HintStore {
- private final Map<String, String> map = _Maps.newHashMap();
+ private final Map<String, String> map = new HashMap<>();
@Override public String get(final Bookmark bookmark, final String hintKey) {
return map.get(hintKey);}
@Override public void set(final Bookmark bookmark, final String hintKey, final String value) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
index 70f2fa9a69f..31e436c5930 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
@@ -18,18 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.attributes;
+import java.util.LinkedHashMap;
import java.util.Optional;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.model.Model;
-
-import org.jspecify.annotations.Nullable;
-
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
@@ -42,6 +35,11 @@
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
import org.apache.causeway.viewer.wicket.ui.util.XrayWkt;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.model.Model;
+import org.jspecify.annotations.Nullable;
public abstract class AttributePanelWithFormField<T>
extends AttributePanelWithInlinePrompt {
@@ -71,29 +69,14 @@ protected final Component getValidationFeedbackReceiver() {
*/
protected MarkupContainer createFieldFrame() {
var renderScenario = getRenderScenario();
- final FieldFragment fieldFragment;
- switch (renderScenario) {
- case READONLY:
- // setup as output-format (no links)
- fieldFragment = FieldFragment.NO_LINK_VIEWING;
- break;
- case CAN_EDIT:
- case CAN_EDIT_INLINE:
- case CAN_EDIT_INLINE_VIA_ACTION:
- case EDITING_WITH_LINK_TO_NESTED:
- // setup as output-format (with links to edit)
- fieldFragment = FieldFragment.LINK_TO_PROMT;
- break;
- case EDITING:
- // setup as input-format
- fieldFragment = attributeModel().isEditingMode()
- ? FieldFragment.NO_LINK_EDITING // supports additional buttons (clear, ...)
- : FieldFragment.NO_LINK_VIEWING;
- break;
-
- default:
- throw _Exceptions.unmatchedCase(renderScenario);
- }
+ final FieldFragment fieldFragment = switch (renderScenario) {
+ case READONLY -> /* setup as output-format (no links) */ FieldFragment.NO_LINK_VIEWING;
+ case CAN_EDIT, CAN_EDIT_INLINE, CAN_EDIT_INLINE_VIA_ACTION, EDITING_WITH_LINK_TO_NESTED -> /* setup as output-format (with links to edit) */ FieldFragment.LINK_TO_PROMT;
+ case EDITING -> /* setup as input-format */ attributeModel().isEditingMode()
+ ? FieldFragment.NO_LINK_EDITING // supports additional buttons (clear, ...)
+ : FieldFragment.NO_LINK_VIEWING; // supports additional buttons (clear, ...)
+ default -> throw _Exceptions.unmatchedCase(renderScenario);
+ };
return Wkt.fragment(fieldFragment.getContainerId(),
fieldFragment.getFragmentId(),
this);
@@ -141,10 +124,10 @@ protected final MarkupContainer createRegularFrame() {
XrayWkt.ifEnabledDo(()->{
// debug (wicket viewer x-ray)
- var xrayDetails = _Maps.<String, String>newLinkedHashMap();
+ var xrayDetails = new LinkedHashMap<String, String>();
xrayDetails.put("panel", this.getClass().getSimpleName());
xrayDetails.put("renderScenario", renderScenario.name());
- xrayDetails.put("inputFragmentType", getInputFragmentType().map(x->x.name()).orElse("(none)"));
+ xrayDetails.put("inputFragmentType", getInputFragmentType().map(InputFragment::name).orElse("(none)"));
xrayDetails.put("formComponent", _Strings.nonEmpty(formComponent.getClass().getSimpleName())
.orElseGet(()->formComponent.getClass().getName()));
xrayDetails.put("formComponent.id", formComponent.getId());
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index abf81deafac..8da046470ed 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -21,11 +21,11 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
@@ -37,8 +37,8 @@ public class BreadcrumbModel implements HasMetaModelContext, Serializable {
private static final int MAX_SIZE = 5;
- private final Map<String, Bookmark> bookmarkByOidStr = _Maps.newHashMap();
- private final Map<Bookmark, String> oidStrByBookmark = _Maps.newHashMap();
+ private final Map<String, Bookmark> bookmarkByOidStr = new HashMap<>();
+ private final Map<Bookmark, String> oidStrByBookmark = new HashMap<>();
private final List<Bookmark> list = new ArrayList<>();
public List<UiObjectWkt> getList() {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index 11b79f46c09..8a1f5827820 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -18,28 +18,26 @@
*/
package org.apache.causeway.viewer.wicket.viewer.registries.pages;
+import java.util.HashMap;
import java.util.Map;
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.apache.wicket.Page;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassList;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistrySpi;
import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
+import org.apache.wicket.Page;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Default implementation of {@link PageClassRegistry}; just delegates to an
@@ -64,8 +62,8 @@ public PageClassRegistryDefault pageClassRegistryDefault(final PageClassList pag
}
private final PageClassList pageClassList; // serializable
- private final Map<PageType, Class<? extends Page>> pageClassByType = _Maps.newHashMap();
- private final Map<Class<? extends Page>, PageType> typeByPageClass = _Maps.newHashMap();
+ private final Map<PageType, Class<? extends Page>> pageClassByType = new HashMap<>();
+ private final Map<Class<? extends Page>, PageType> typeByPageClass = new HashMap<>();
@Inject
public PageClassRegistryDefault(final PageClassList pageClassList) {
@@ -80,9 +78,8 @@ public void init() {
private void ensureAllPageTypesRegistered() {
for (final PageType pageType : PageType.values()) {
- if (getPageClass(pageType) == null) {
- throw new IllegalStateException("No page registered for " + pageType);
- }
+ if (getPageClass(pageType) == null)
+ throw new IllegalStateException("No page registered for " + pageType);
}
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index 99590ed8809..cfaffbd38ff 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -115,7 +115,7 @@ protected Map<String, String> hintsFor(final Bookmark bookmark) {
LinkedHashMap<String, String> hints =
_Casts.uncheckedCast(Session.get().getAttribute(sessionAttribute));
if(hints == null) {
- hints = _Maps.newLinkedHashMap();
+ hints = new LinkedHashMap<>();
Session.get().setAttribute(sessionAttribute, hints);
}
return hints;