You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/18 15:37:32 UTC
[isis] branch ISIS-2750 updated: ISIS-2750: further compile fixes
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2750
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2750 by this push:
new d240d1d ISIS-2750: further compile fixes
d240d1d is described below
commit d240d1df4d73ccf974b34b8bf8ab787727089835
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 18 16:37:17 2021 +0100
ISIS-2750: further compile fixes
---
.../org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java | 6 ++----
.../core/metamodel/services/metamodel/MetaModelServiceDefault.java | 3 +++
.../fixtures/applib/services/InitialFixtureScriptsInstaller.java | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index 8db9f57..b02f34c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -36,11 +36,9 @@ import lombok.NonNull;
public abstract class FacetFactoryAbstract
implements FacetFactory, HasMetaModelContext {
- @Getter(onMethod_ = {@Override}))
- private final @NonNull MetaModelContext metaModelContext;
+ @Getter(onMethod_ = {@Override}) private final @NonNull MetaModelContext metaModelContext;
- @Getter(onMethod_ = {@Override}))
- private final ImmutableEnumSet<FeatureType> featureTypes;
+ @Getter(onMethod_ = {@Override}) private final ImmutableEnumSet<FeatureType> featureTypes;
public FacetFactoryAbstract(
final MetaModelContext metaModelContext,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 42502ef..7546b19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.services.metamodel;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -42,9 +43,11 @@ import org.apache.isis.applib.services.metamodel.Config;
import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.DomainModel;
import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
index f94f3eb..94aeb99 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
@@ -26,6 +26,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
@@ -70,7 +71,7 @@ public class InitialFixtureScriptsInstaller {
}
@EventListener(MetamodelEvent.class)
- @javax.annotation.Priority(PriorityPrecedence.LAST - 100)
+ @Order(PriorityPrecedence.LAST - 100)
public void onMetamodelEvent(final MetamodelEvent event) {
log.debug("received metamodel event {}", event);