You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/07/04 08:15:10 UTC
[isis] branch master updated: ISIS-2787: workaround lombok issues
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 03b53db ISIS-2787: workaround lombok issues
03b53db is described below
commit 03b53dbc71ef490441bc1737334826373358aa40
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Jul 4 10:14:59 2021 +0200
ISIS-2787: workaround lombok issues
---
.../_testing/MetaModelContext_forTesting.java | 53 ++++++++++------------
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../services/grid/GridXmlRoundtripTest.java | 12 -----
3 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
index 8998e1b..383f559 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.Supplier;
import java.util.stream.Stream;
import org.springframework.core.env.AbstractEnvironment;
@@ -50,7 +49,6 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.ioc._ManagedBeanAdapter;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
@@ -87,7 +85,6 @@ import static java.util.Objects.requireNonNull;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
-import lombok.Value;
import lombok.val;
@Builder @Getter
@@ -184,25 +181,6 @@ implements MetaModelContext {
return getSystemEnvironment().ioc().getSingletonElseFail(type);
}
- @Value @Builder
- static class ManagedBeanProvider implements _ManagedBeanAdapter {
-
- String id;
- Supplier<?> instanceProvider;
- public Class<?> beanClass;
-
- @Override
- public boolean isCandidateFor(Class<?> requiredType) {
- throw _Exceptions.notImplemented();
- }
-
- @Override
- public Can<?> getInstance() {
- return Can.ofSingleton(instanceProvider.get());
- }
-
- }
-
private Stream<Object> streamSingletons() {
val fields = Stream.of(
@@ -404,14 +382,23 @@ implements MetaModelContext {
private final JaxbService jaxbService = new JaxbService.Simple();
@Getter(lazy = true)
- private final GridReaderUsingJaxb gridReader = new GridReaderUsingJaxb(getJaxbService(), null);
+ private final MenuBarsService menuBarsService = MenuBarsService.forTesting();
+
+ @Getter(lazy = true)
+ private final GridReaderUsingJaxb gridReader = new GridReaderUsingJaxb(getJaxbService(), /*circular depend.*/null);
@Getter(lazy = true)
- private final GridLoaderService gridLoaderService =
- new GridLoaderServiceDefault(getMessageService(), getGridReader(), getSystemEnvironment());
+ private final GridLoaderService gridLoaderService = createGridLoaderService();
+ //XXX lombok issue: won't compile if inlined
+ private final GridLoaderService createGridLoaderService() {
+ return new GridLoaderServiceDefault(getGridReader(), getMessageService(), getSystemEnvironment());
+ }
@Getter(lazy = true)
- private final GridService gridService = new GridServiceDefault(
+ private final GridService gridService = createGridService();
+ //XXX lombok issue: won't compile if inlined
+ private final GridService createGridService() {
+ return new GridServiceDefault(
getGridLoaderService(), _Lists.of(
new GridSystemServiceBootstrap(getGridReader(),
getSpecificationLoader(),
@@ -419,12 +406,18 @@ implements MetaModelContext {
getJaxbService(),
getMessageService(),
getSystemEnvironment())));
+ }
@Getter(lazy = true)
- private final MenuBarsService menuBarsService = MenuBarsService.forTesting();
+ private final LayoutService layoutService = createLayoutService();
+ //XXX lombok issue: won't compile if inlined
+ private final LayoutService createLayoutService() {
+ return new LayoutServiceDefault(
+ getSpecificationLoader(),
+ getJaxbService(),
+ getGridService(),
+ getMenuBarsService());
+ }
- @Getter(lazy = true)
- private final LayoutService layoutService = new LayoutServiceDefault(
- getSpecificationLoader(), getJaxbService(), getGridService(), getMenuBarsService());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index a963d77..4af83ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -57,8 +57,8 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class GridLoaderServiceDefault implements GridLoaderService {
- private final MessageService messageService;
private final GridReaderUsingJaxb gridReader;
+ private final MessageService messageService;
private final IsisSystemEnvironment isisSystemEnvironment;
@Value
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
index 669bb19..c1b6570 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
@@ -49,26 +49,14 @@ class GridXmlRoundtripTest
extends MetaModelTestAbstract {
private JaxbService jaxbService;
-// private GridLoaderServiceDefault gridLoaderService;
-// private LayoutService layoutService;
private GridServiceDefault gridServiceDefault;
-// private GridSystemServiceBootstrap gridSystemServiceBS3;
@Override
protected void afterSetUp() {
jaxbService = getServiceRegistry().lookupServiceElseFail(JaxbService.class);
gridServiceDefault = (GridServiceDefault)getServiceRegistry().lookupServiceElseFail(GridService.class);
- //gridLoaderService = (GridLoaderServiceDefault)getServiceRegistry().lookupServiceElseFail(GridLoaderService.class);
}
-// @BeforeEach
-// void setUp() throws Exception {
-//
-// gridSystemServiceBS3 = new GridSystemServiceBootstrap(null);
-// gridServiceDefault.gridSystemServicesForTest = _Lists.of(gridSystemServiceBS3);
-// }
-
-
@Test
void happy_case() throws Exception {