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 08:23:49 UTC
(causeway) branch main updated: CAUSEWAY-4044: removes trivial factory method _Sets#linkedHashSet
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 29a9e575df9 CAUSEWAY-4044: removes trivial factory method _Sets#linkedHashSet
29a9e575df9 is described below
commit 29a9e575df922e4d3bded4fd0a1b56d2afc3cac3
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Aug 17 10:23:43 2026 +0200
CAUSEWAY-4044: removes trivial factory method _Sets#linkedHashSet
---
.../apache/causeway/commons/internal/collections/_Sets.java | 5 +----
.../causeway/commons/internal/collections/_SetsTest.java | 2 +-
.../core/metamodel/facets/collections/CollectionFacet.java | 6 +++---
.../metamodel/services/grid/GridInitializationModel.java | 7 +++----
.../metamodel/services/grid/ObjectMemberResolverForGrid.java | 5 +++--
.../menubars/bootstrap/MenuBarsServiceBootstrap.java | 4 ++--
.../viewer/wicketapp/config/WicketViewerCssBundleInit.java | 12 +++++-------
7 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
index e3b3fb3b0a2..406909ccc33 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
@@ -149,13 +149,10 @@ public static <T> HashSet<T> newHashSet(final @Nullable Iterable<T> iterable) {
// -- LINKED HASH SET
- public static <T> LinkedHashSet<T> newLinkedHashSet() {
- return new LinkedHashSet<T>();
- }
public static <T> LinkedHashSet<T> newLinkedHashSet(final @Nullable Collection<T> collection) {
if(collection==null)
- return newLinkedHashSet();
+ return new LinkedHashSet<>();
return new LinkedHashSet<T>(collection);
}
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
index d9ae785c8ff..4a9a531c2ac 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
@@ -165,7 +165,7 @@ void testNewHashSetIterableOfT() {
*/
@Test
void testNewLinkedHashSet() {
- var set = _Sets.newLinkedHashSet();
+ var set = new LinkedHashSet<>();
assertEquals(LinkedHashSet.class, set.getClass());
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
index 92ebc9303ce..044a3a47d81 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
@@ -176,15 +176,15 @@ public static Object collect(
// specific set implementations
Map.entry(CopyOnWriteArraySet.class, _Sets::newCopyOnWriteArraySet),
- Map.entry(LinkedHashSet.class, _Sets::newLinkedHashSet),
+ Map.entry(LinkedHashSet.class, LinkedHashSet::new),
Map.entry(HashSet.class, HashSet::new),
Map.entry(TreeSet.class, TreeSet::new),
- Map.entry(AbstractSet.class, _Sets::newLinkedHashSet),
+ Map.entry(AbstractSet.class, LinkedHashSet::new),
// interfaces
Map.entry(List.class, ArrayList::new),
Map.entry(SortedSet.class, TreeSet::new),
- Map.entry(Set.class, _Sets::newLinkedHashSet),
+ Map.entry(Set.class, LinkedHashSet::new),
Map.entry(Collection.class, ArrayList::new)
);
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 0c18d205681..6f75f8d324e 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
@@ -114,9 +114,8 @@ public void visit(final FieldSet fieldSet) {
}
});
- if(gridModel.gridErrorsDetected) {
- return Optional.empty();
- }
+ if(gridModel.gridErrorsDetected)
+ return Optional.empty();
bsGrid.visit(new BSElementVisitor(){
@@ -214,7 +213,7 @@ public void enter(final BSTabGroup bsTabGroup) {
// --
- private final LinkedHashSet<String> allIds = _Sets.newLinkedHashSet();
+ 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();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/ObjectMemberResolverForGrid.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/ObjectMemberResolverForGrid.java
index ba5b22fdf11..5c9936fe854 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/ObjectMemberResolverForGrid.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/ObjectMemberResolverForGrid.java
@@ -24,6 +24,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -149,7 +150,7 @@ private boolean validateAndNormalize(
if(boundAssociationIds == null) {
boundAssociationIds = stream(fieldSet.getProperties())
.map(PropertyLayoutData::getId)
- .collect(Collectors.toCollection(_Sets::newLinkedHashSet));
+ .collect(Collectors.toCollection(LinkedHashSet::new));
boundAssociationIdsByFieldSetId.put(fieldSetId, boundAssociationIds);
}
}
@@ -167,7 +168,7 @@ private boolean validateAndNormalize(
var id = layoutGroupFacet.getGroupId();
if(gridModel.containsFieldSetId(id)) {
Set<String> boundAssociationIds =
- boundAssociationIdsByFieldSetId.computeIfAbsent(id, k -> _Sets.newLinkedHashSet());
+ boundAssociationIdsByFieldSetId.computeIfAbsent(id, k -> new LinkedHashSet<>());
boundAssociationIds.add(oneToOneAssociation.getId());
} else if(id.equals(LayoutConstants.FieldSetId.METADATA)) {
unboundMetadataContributingIds.add(oneToOneAssociation.getId());
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 56ea8a7d79b..5ffddf3a18c 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,6 +19,7 @@
package org.apache.causeway.core.runtimeservices.menubars.bootstrap;
import java.util.ArrayList;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -41,7 +42,6 @@
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.commons.internal.collections._Sets;
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;
@@ -354,7 +354,7 @@ private static List<BSMenu> buildMenuItemsFromAnnotationsOnly(
private static Set<String> serviceNamesInOrder(
final Can<ManagedObject> serviceAdapters,
final List<ServiceAndAction> serviceActions) {
- final Set<String> serviceNameOrder = _Sets.newLinkedHashSet();
+ final Set<String> serviceNameOrder = new LinkedHashSet<>();
// first, order as defined in causeway.properties
for (ManagedObject serviceAdapter : serviceAdapters) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
index 6cc058d763a..a8026ef4633 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
@@ -18,20 +18,18 @@
*/
package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
+import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import org.springframework.context.annotation.Configuration;
-
-import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.actionlinks.entityactions.ActionLinksPanel;
import org.apache.causeway.viewer.wicket.ui.components.attributes.string.StringAttributePanelFactory;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.springframework.context.annotation.Configuration;
@Configuration
public class WicketViewerCssBundleInit implements WicketApplicationInitializer {
@@ -59,7 +57,7 @@ public void init(final WebApplication webApplication) {
private Set<CssResourceReference> cssResourceReferencesForAllComponents() {
// TODO mgrigorov: CAUSEWAY-537 temporary disabled to not mess up with Bootstrap styles
// Collection<ComponentFactory> componentFactories = getComponentFactoryRegistry().listComponentFactories();
- return _Sets.newLinkedHashSet(
+ return new LinkedHashSet<>(
// Iterables.concat(
// Iterables.transform(
// componentFactories,