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 2020/01/07 09:32:10 UTC
[isis] branch master updated: ISIS-2158: reordering injection
points to the top of the class
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 2ac5a6c ISIS-2158: reordering injection points to the top of the class
2ac5a6c is described below
commit 2ac5a6cf5e8e110ea5c3d7adc0b65a4918a63841
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 7 10:31:59 2020 +0100
ISIS-2158: reordering injection points to the top of the class
and making these private when possible
also fixing lots of unused field compiler warnings
---
.../applib/mixins/layout/Object_openRestApi.java | 3 +-
.../exceprecog/ExceptionRecognizerAbstract.java | 16 ++++-----
.../annotprop/CssClassFaFacetOnMemberFactory.java | 24 +++++++-------
...FacetOnPropertyDerivedFromImmutableFactory.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 --
.../metamodel/services/ServiceInjectorDefault.java | 3 --
.../services/appfeat/ApplicationFeature.java | 12 ++-----
.../appfeat/ApplicationFeatureFactory.java | 3 --
.../ApplicationFeatureRepositoryDefault.java | 2 --
.../classsubstitutor/ClassSubstitutorDefault.java | 3 --
.../services/events/MetamodelEventService.java | 16 ++++-----
.../exceprecog/ExceptionRecognizerDocDefault.java | 3 --
.../services/grid/GridReaderUsingJaxb.java | 10 +++---
.../services/grid/GridServiceDefault.java | 12 ++-----
.../services/layout/LayoutServiceDefault.java | 12 +++----
.../metamodel/MetaModelServiceDefault.java | 23 ++-----------
.../services/title/TitleServiceDefault.java | 2 --
.../specloader/InjectorMethodEvaluatorDefault.java | 3 --
.../actions/ActionMethodsFacetFactoryTest.java | 4 +--
.../ObjectDisabledMethodFacetFactoryTest.java | 3 --
.../DomainServiceLayoutFacetFactoryTest.java | 6 ++--
.../title/TitleFacetViaMethodsFactoryTest.java | 4 ---
.../TitleAnnotationFacetFactoryTest.java | 2 +-
.../ObjectValidMethodFacetFactoryTest.java | 3 --
.../PropertyMethodsFacetFactoryTest.java | 7 +---
.../services/ServiceInjectorLegacyTest.java | 3 +-
.../services/appfeat/ApplicationFeatureIdTest.java | 1 +
...eptionRecognizerCompositeForJdoObjectStore.java | 11 +++----
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 10 ------
.../bookmarks/BookmarkServiceInternalDefault.java | 2 --
.../services/command/CommandServiceDefault.java | 3 --
.../services/eventbus/EventBusServiceSpring.java | 3 --
.../services/factory/FactoryServiceDefault.java | 2 --
.../services/i18n/po/TranslationServicePo.java | 3 --
.../services/message/MessageServiceDefault.java | 9 +++--
.../publish/PublisherDispatchServiceDefault.java | 19 ++++-------
.../repository/RepositoryServiceDefault.java | 2 --
.../services/routing/RoutingServiceDefault.java | 6 ++--
.../sessmgmt/SessionManagementServiceDefault.java | 6 ++--
.../runtime/services/sudo/SudoServiceDefault.java | 3 --
.../userprof/UserProfileServiceDefault.java | 10 ++----
.../userreg/EmailNotificationServiceDefault.java | 9 ++---
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 3 --
.../context/session/RuntimeEventService.java | 3 --
.../session/events/PersistenceEventService.java | 7 ++--
.../session/events/TimestampService.java | 8 ++---
.../transaction/AuditerDispatchService.java | 2 --
.../transaction/ChangedObjectsService.java | 2 --
.../events/TransactionAfterBeginEvent.java | 22 +++++++++++--
.../events/TransactionAfterCommitEvent.java | 24 +++++++++++---
.../events/TransactionAfterRollbackEvent.java | 24 +++++++++++---
.../events/TransactionBeforeBeginEvent.java | 20 ++++++++++++
.../events/TransactionBeforeCommitEvent.java | 24 +++++++++++---
.../events/TransactionBeforeRollbackEvent.java | 24 +++++++++++---
.../events/TransactionEventAbstract.java | 20 ++++++++++++
.../system/ObjectActionLayoutXmlDefaultTest.java | 5 ++-
.../system/OneToManyAssociationDefaultTest.java | 2 ++
.../bypass/authentication/AuthenticatorBypass.java | 3 --
.../bypass/authorization/AuthorizorBypass.java | 3 --
.../keycloak/authorization/AuthorizorKeycloak.java | 3 --
.../keycloak/webmodule/WebModuleKeycloak.java | 2 --
.../shiro/authorization/AuthorizorShiro.java | 1 -
.../security/shiro/webmodule/WebModuleShiro.java | 2 --
.../webmodule/WebModuleJaxrsResteasy4.java | 2 --
.../domainobjects/ActionResultReprRenderer.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 --
.../acceptheader/AcceptHeaderServiceForRest.java | 3 --
.../ContentNegotiationServiceOrgApacheIsisV1.java | 5 ++-
.../swagger/internal/SwaggerSpecGenerator.java | 3 --
.../service/swagger/internal/TaggerDefault.java | 3 --
.../viewer/mappers/entity/ExceptionDetail.java | 10 ++++--
.../viewer/mappers/entity/ExceptionPojo.java | 10 +++---
.../resources/ObjectAdapterAccessHelper.java | 9 -----
.../components/actions/ActionParametersPanel.java | 2 --
.../registries/pages/PageClassListDefault.java | 3 --
.../registries/pages/PageClassRegistryDefault.java | 11 ++++---
.../pages/PageNavigationServiceDefault.java | 6 +---
.../viewer/services/BookmarkUiServiceWicket.java | 3 --
.../viewer/services/DeepLinkServiceWicket.java | 3 --
.../services/ImageResourceCacheClassPath.java | 3 --
.../viewer/services/LocaleProviderWicket.java | 3 --
.../services/WicketViewerSettingsDefault.java | 2 --
.../wicket/viewer/webmodule/WebModuleWicket.java | 2 --
.../pages/PageClassListDefault_Instantiation.java | 3 +-
.../spring/service/SpringBeansService.java | 2 --
.../dom/services/calendar/CalendarService.java | 38 +++++++++-------------
.../CalendarServiceTest_beginningOfMonth.java | 4 +--
.../CalendarServiceTest_beginningOfQuarter.java | 3 +-
.../h2console/dom/services/H2ManagerMenu.java | 9 ++---
.../dom/webmodule/WebModuleH2Console.java | 2 --
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 7 ++--
.../PasswordEncryptionServiceUsingJBcrypt.java | 3 --
.../permission/ApplicationPermissionFactory.java | 3 --
.../ApplicationPermissionRepository.java | 2 --
.../jdo/dom/role/ApplicationRoleFactory.java | 3 --
.../jdo/dom/role/ApplicationRoleRepository.java | 3 --
.../jdo/dom/tenancy/ApplicationTenancyFactory.java | 3 --
.../dom/tenancy/ApplicationTenancyRepository.java | 3 --
.../jdo/dom/user/ApplicationUserFactory.java | 7 ++--
.../jdo/dom/user/ApplicationUserRepository.java | 20 +++---------
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 4 ---
.../services/SecurityRealmServiceUsingShiro.java | 2 --
.../extensions/fakedata/dom/services/Comms.java | 2 +-
.../fakedata/dom/services/FakeDataService.java | 4 +--
.../fakedata/dom/services/J8DateTimes.java | 1 -
.../fixtures/FixturesLifecycleService.java | 8 ++---
.../fixturescripts/ExecutionParametersService.java | 3 --
.../fixtures/fixturescripts/FixtureResultList.java | 20 +++---------
.../QueryResultsCacheControlDefault.java | 3 --
.../sse/webmodule/WebModuleServerSentEvents.java | 2 --
.../services/eventbus/ActionDomainEvent.java | 14 ++------
.../services/eventbus/CollectionDomainEvent.java | 15 ++-------
.../services/eventbus/PropertyDomainEvent.java | 14 ++------
113 files changed, 302 insertions(+), 478 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
index 1452f3e..556d8f2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
@@ -31,7 +31,6 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.MixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.confview.ConfigurationViewService;
import org.apache.isis.applib.value.LocalResourcePath;
import lombok.RequiredArgsConstructor;
@@ -42,7 +41,7 @@ import lombok.val;
public class Object_openRestApi {
@Inject private BookmarkService bookmarkService;
- @Inject private ConfigurationViewService configurationViewService;
+ //@Inject private ConfigurationViewService configurationViewService;
@Inject private RestfulPathProvider restfulPathProvider;
private final Object holder;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 9652dc6..53048b3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -47,14 +47,14 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public abstract class ExceptionRecognizerAbstract implements ExceptionRecognizer {
- /**
- * Normally recognized exceptions are not logged (because they are expected and handled).
- *
- * <p>
- * This key is primarily for diagnostic purposes, to log the exception regardless.
- */
- private static final String KEY_LOG_RECOGNIZED_EXCEPTIONS =
- "isis.services.exceprecog.logRecognizedExceptions";
+// /**
+// * Normally recognized exceptions are not logged (because they are expected and handled).
+// *
+// * <p>
+// * This key is primarily for diagnostic purposes, to log the exception regardless.
+// */
+// private static final String KEY_LOG_RECOGNIZED_EXCEPTIONS =
+// "isis.services.exceprecog.logRecognizedExceptions";
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
index e99f92e..bf7c73e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
@@ -29,7 +29,9 @@ import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaPosition;
-public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
+public class CssClassFaFacetOnMemberFactory
+extends FacetFactoryAbstract
+implements ContributeeMemberFacetFactory {
public CssClassFaFacetOnMemberFactory() {
super(FeatureType.ACTIONS_ONLY);
@@ -48,16 +50,14 @@ public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract impleme
}
- // region > faIconFromPattern
-
- /**
- * The pattern matches definitions like:
- * <ul>
- * <li>methodNameRegex:cssClassFa - will render the Font Awesome icon on the left of the title</li>
- * <li>methodNameRegex:cssClassFa:(left|right) - will render the Font Awesome icon on the specified position of the title</li>
- * </ul>
- */
- private final static Pattern FA_ICON_REGEX_PATTERN = Pattern.compile("([^:]+):(.+)");
+// /*
+// * The pattern matches definitions like:
+// * <ul>
+// * <li>methodNameRegex:cssClassFa - will render the Font Awesome icon on the left of the title</li>
+// * <li>methodNameRegex:cssClassFa:(left|right) - will render the Font Awesome icon on the specified position of the title</li>
+// * </ul>
+// */
+// private final static Pattern FA_ICON_REGEX_PATTERN = Pattern.compile("([^:]+):(.+)");
private CssClassFaFacet createFromConfiguredRegexIfPossible(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
@@ -99,7 +99,5 @@ public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract impleme
return faIconByPattern;
}
- // endregion
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
index b05d260..48d3098 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
@@ -38,7 +38,7 @@ public class DisabledFacetOnPropertyDerivedFromImmutableFactory extends FacetFac
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(
declaringClass);
if (spec.containsNonFallbackFacet(ImmutableFacet.class)) {
- final ImmutableFacet immutableFacet = spec.getFacet(ImmutableFacet.class);
+ //final ImmutableFacet immutableFacet = spec.getFacet(ImmutableFacet.class);
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
DisabledFacet facet = facetHolder.getFacet(DisabledFacet.class);
if(facet != null && facet.isInvertedSemantics()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 8f3251b..3988c68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -33,7 +33,6 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
*
@@ -42,7 +41,6 @@ import lombok.extern.log4j.Log4j2;
*/
@Component
@Named("isisMetaModel.ProgrammingModelInitFilterDefault")
-@Log4j2
public class ProgrammingModelInitFilterDefault implements ProgrammingModelInitFilter {
@Inject private IsisConfiguration configuration;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
index cf903aa..ae1a70e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
@@ -33,8 +33,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import lombok.extern.log4j.Log4j2;
-
/**
*
* @since 2.0
@@ -45,7 +43,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.HIGH)
@Primary
@Qualifier("Default")
-@Log4j2
public class ServiceInjectorDefault implements ServiceInjector {
@Inject private AutowireCapableBeanFactory autowireCapableBeanFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
index 339965b..39765bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
@@ -48,19 +48,13 @@ import org.apache.isis.commons.internal.collections._Sets;
public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static abstract class PropertyDomainEvent<T>
- extends IsisModuleApplib.PropertyDomainEvent<ApplicationFeature, T> {
- private static final long serialVersionUID = 1L;
- }
+ extends IsisModuleApplib.PropertyDomainEvent<ApplicationFeature, T> {}
public static abstract class CollectionDomainEvent<T>
- extends IsisModuleApplib.CollectionDomainEvent<ApplicationFeature, T> {
- private static final long serialVersionUID = 1L;
- }
+ extends IsisModuleApplib.CollectionDomainEvent<ApplicationFeature, T> {}
public static abstract class ActionDomainEvent
- extends IsisModuleApplib.ActionDomainEvent<ApplicationFeature> {
- private static final long serialVersionUID = 1L;
- }
+ extends IsisModuleApplib.ActionDomainEvent<ApplicationFeature> {}
// -- constants
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
index 6530a61..e3e39f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -29,14 +29,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisMetaModel.ApplicationFeatureFactory")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class ApplicationFeatureFactory {
public ApplicationFeature newApplicationFeature() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index be2030b..28e0493 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -62,11 +62,9 @@ import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisMetaModel.ApplicationFeatureRepositoryDefault")
-@Log4j2
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
// -- caches
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index 3af8817..32f0bd2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -23,11 +23,8 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import lombok.extern.log4j.Log4j2;
-
@Component
@Named("isisMetaModel.ClassSubstitutorDefault")
-@Log4j2
public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
public ClassSubstitutorDefault() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
index c28af6a..949ef2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
@@ -37,7 +37,6 @@ import org.apache.isis.applib.events.ui.LayoutUiEvent;
import org.apache.isis.applib.events.ui.TitleUiEvent;
import lombok.Builder;
-import lombok.extern.log4j.Log4j2;
/**
*
@@ -49,18 +48,17 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
@Builder //for JUnit Test support
public class MetamodelEventService {
- @Inject Event<CssClassUiEvent<Object>> cssClassUiEvents;
- @Inject Event<IconUiEvent<Object>> iconUiEvents;
- @Inject Event<LayoutUiEvent<Object>> layoutUiEvents;
- @Inject Event<TitleUiEvent<Object>> titleUiEvents;
+ @Inject private Event<CssClassUiEvent<Object>> cssClassUiEvents;
+ @Inject private Event<IconUiEvent<Object>> iconUiEvents;
+ @Inject private Event<LayoutUiEvent<Object>> layoutUiEvents;
+ @Inject private Event<TitleUiEvent<Object>> titleUiEvents;
- @Inject Event<ActionDomainEvent<?>> actionDomainEvents;
- @Inject Event<PropertyDomainEvent<?, ?>> propertyDomainEvents;
- @Inject Event<CollectionDomainEvent<?, ?>> collectionDomainEvents;
+ @Inject private Event<ActionDomainEvent<?>> actionDomainEvents;
+ @Inject private Event<PropertyDomainEvent<?, ?>> propertyDomainEvents;
+ @Inject private Event<CollectionDomainEvent<?, ?>> collectionDomainEvents;
// -- METAMODEL UI EVENTS
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
index 6bf725e..f783551 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
@@ -36,14 +36,11 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisMetaModel.ExceptionRecognizerDocDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class ExceptionRecognizerDocDefault implements ExceptionRecognizer {
@Inject private ServiceInjector serviceInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
index 5fdd389b..fe883fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -38,8 +38,6 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Arrays;
-import lombok.extern.log4j.Log4j2;
-
/**
*
* @since 2.0
@@ -50,9 +48,11 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class GridReaderUsingJaxb {
+ @Inject private JaxbService jaxbService;
+ @Inject private List<GridSystemService<?>> gridSystemServices;
+
private JAXBContext jaxbContext;
@PostConstruct
@@ -71,8 +71,6 @@ public class GridReaderUsingJaxb {
public Grid loadGrid(String xml) {
return (Grid) jaxbService.fromXml(jaxbContext, xml);
}
-
- @Inject JaxbService jaxbService;
- @Inject List<GridSystemService<?>> gridSystemServices;
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
index b6467b1..d96bced 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
@@ -38,14 +38,11 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisMetaModel.GridServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class GridServiceDefault implements GridService {
public static final String COMPONENT_TNS = "http://isis.apache.org/applib/layout/component";
@@ -53,6 +50,9 @@ public class GridServiceDefault implements GridService {
public static final String LINKS_TNS = "http://isis.apache.org/applib/layout/links";
public static final String LINKS_SCHEMA_LOCATION = "http://isis.apache.org/applib/layout/links/links.xsd";
+
+ @Inject private GridLoaderService gridLoaderService;
+ @Inject private List<GridSystemService<?>> gridSystemServices;
// //////////////////////////////////////
@@ -205,11 +205,5 @@ public class GridServiceDefault implements GridService {
: gridSystemServicesForTest;
}
- // -- DEPENDENCIES
-
- @Inject GridLoaderService gridLoaderService;
- @Inject private List<GridSystemService<?>> gridSystemServices;
-
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index 90fc923..817080f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -46,15 +46,18 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisMetaModel.LayoutServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class LayoutServiceDefault implements LayoutService {
+
+ @Inject private SpecificationLoader specificationLoader;
+ @Inject private JaxbService jaxbService;
+ @Inject private GridService gridService;
+ @Inject private MenuBarsService menuBarsService;
@Override
public String toXml(final Class<?> domainClass, final Style style) {
@@ -139,9 +142,6 @@ public class LayoutServiceDefault implements LayoutService {
));
}
- @Inject SpecificationLoader specificationLoader;
- @Inject JaxbService jaxbService;
- @Inject GridService gridService;
- @Inject MenuBarsService menuBarsService;
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
index ce6681a..fd0fcd3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -39,7 +39,6 @@ import org.apache.isis.applib.services.grid.GridService;
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.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
@@ -57,16 +56,16 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisMetaModel.MetaModelServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class MetaModelServiceDefault implements MetaModelService {
+ @Inject private SpecificationLoader specificationLoader;
+ @Inject private GridService gridService;
+
private MetaModelExporter metaModelExporter;
@PostConstruct
@@ -269,21 +268,5 @@ public class MetaModelServiceDefault implements MetaModelService {
return metaModelExporter.exportMetaModel(config);
}
- @Inject ServiceRegistry serviceRegistry;
-
- //-------------
- //TODO[2112] workaround circular dependency issues when bootstrapping ...
- @Inject SpecificationLoader specificationLoader;
- @Inject GridService gridService;
- //
- // private _Lazy<SpecificationLoader> specificationLoader = _Lazy.threadSafe(()->
- // serviceRegistry.lookupServiceElseFail(SpecificationLoader.class));
- // //
- // private _Lazy<GridService> gridService = _Lazy.threadSafe(()->
- // serviceRegistry.lookupServiceElseFail(GridService.class));
- // //
- // private _Lazy<MetaModelExporter> metaModelExporter = _Lazy.threadSafe(()->
- // new MetaModelExporter(specificationLoader.get()));
- //-------------
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
index 7be0891..78a7923 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
@@ -34,14 +34,12 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisMetaModel.TitleServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class TitleServiceDefault implements TitleService {
@Inject private WrapperFactory wrapperFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
index cc12e9b..f4ecd43 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
@@ -31,14 +31,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisMetaModel.InjectorMethodEvaluatorDefault")
@Order(OrderPrecedence.HIGH)
@Primary
@Qualifier("Default")
-@Log4j2
public final class InjectorMethodEvaluatorDefault implements InjectorMethodEvaluator {
//TODO[2112] cleanup comment
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 3446a7a..4a71064 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -61,8 +61,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
private final ObjectSpecification voidSpec = new ObjectSpecificationStub("VOID");
- private final ObjectSpecification stringSpec = new ObjectSpecificationStub("java.lang.String");
- private final ObjectSpecification customerSpec = new ObjectSpecificationStub("Customer");
+// private final ObjectSpecification stringSpec = new ObjectSpecificationStub("java.lang.String");
+// private final ObjectSpecification customerSpec = new ObjectSpecificationStub("Customer");
@Override
public void setUp() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
index 384cba1..cfff74f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
@@ -28,12 +28,9 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethod;
import org.apache.isis.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethodFactory;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
public class ObjectDisabledMethodFacetFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
private DisabledObjectFacetViaMethodFactory facetFactory;
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
index 83076b0..fef0597 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
@@ -67,8 +67,8 @@ public class DomainServiceLayoutFacetFactoryTest extends AbstractFacetFactoryTes
}
- public void testDomainServiceMenuOrderAnnotationPickedUpOnClass() {
- @DomainService//(menuOrder = "123")
+ public void testDomainServiceAnnotationPickedUpOnClass() {
+ @DomainService
class Customers {
}
@@ -78,7 +78,7 @@ public class DomainServiceLayoutFacetFactoryTest extends AbstractFacetFactoryTes
assertNotNull(facet);
assertTrue(facet instanceof DomainServiceLayoutFacetAnnotation);
DomainServiceLayoutFacetAnnotation domainServiceLayoutFacet = (DomainServiceLayoutFacetAnnotation) facet;
- //Assert.assertThat(domainServiceLayoutFacet.getMenuOrder(), is("123"));
+ Assert.assertNotNull(domainServiceLayoutFacet);
assertNoMethodsRemoved();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
index 6abc9d7..8a47961 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
@@ -29,13 +29,9 @@ import org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaMethod
import org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
import org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaToStringMethod;
import org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
public class TitleFacetViaMethodsFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
-
private TitleFacetViaMethodsFactory facetFactory;
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 99600fa..642705d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -149,7 +149,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
final List<Method> titleMethods = Arrays.asList(Customer2.class.getMethod("titleElement1"), Customer2.class.getMethod("titleElement3"), Customer2.class.getMethod("titleElement2"));
- final List<TitleComponent> components = titleFacetViaTitleAnnotation.getComponents();
+ //final List<TitleComponent> components = titleFacetViaTitleAnnotation.getComponents();
for (int i = 0; i < titleMethods.size(); i++) {
final Annotations.MethodEvaluator<Title> titleEvaluator = (Annotations.MethodEvaluator<Title>) titleFacetViaTitleAnnotation.getComponents().get(i)
.getTitleEvaluator();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
index d498454..0c04140 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
@@ -26,12 +26,9 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethod;
import org.apache.isis.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
public class ObjectValidMethodFacetFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
private ValidateObjectFacetMethodFactory facetFactory;
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index 23d4314..d0c4cb0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -63,17 +63,12 @@ import org.apache.isis.metamodel.facets.properties.validating.PropertyValidateFa
import org.apache.isis.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
import org.apache.isis.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethodFactory;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private ObjectSpecification mockSpecification;
-
+ @Mock private ObjectSpecification mockSpecification;
@Override
public void setUp() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index 9a0e6a9..ca8c03e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@@ -126,7 +125,7 @@ class ServiceInjectorLegacyTest {
@Inject private ServiceInjector injector;
@Inject private ServiceRegistry registry;
- @Inject private ApplicationContext applicationContext;
+ //@Inject private ApplicationContext applicationContext;
@Inject private IsisConfiguration isisConfiguration;
@BeforeEach
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index 81a49b2..2166ce5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -603,6 +603,7 @@ public class ApplicationFeatureIdTest {
public static class IsClassContaining extends PredicatesTest {
+ @SuppressWarnings("unused")
private ApplicationMemberType memberType;
@Mock
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
index 202a3bf..0af2f24 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -32,8 +32,6 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.config.IsisConfiguration;
-import lombok.extern.log4j.Log4j2;
-
/**
* Convenience implementation of the {@link ExceptionRecognizer} domain service that
* recognizes a number of common and non-fatal exceptions (such as unique constraint
@@ -50,14 +48,16 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionRecognizerComposite {
+ @Inject IsisConfiguration configuration; // for testing not private
+
@Override
@PostConstruct
public void init() {
- final boolean disabled = configuration.getServices().getExceptionRecognizerCompositeForJdoObjectStore().isDisable();
+ final boolean disabled = configuration.getServices()
+ .getExceptionRecognizerCompositeForJdoObjectStore().isDisable();
if(disabled) {
return;
}
@@ -75,7 +75,4 @@ public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionReco
add(new ExceptionRecognizerForJDODataStoreException());
}
- @Inject
- IsisConfiguration configuration;
-
}
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index 71ac24e..6cad1dd 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
import javax.inject.Named;
import javax.jdo.Extent;
import javax.jdo.JDOQLTypedQuery;
@@ -43,7 +42,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -51,12 +49,9 @@ import org.apache.isis.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.extern.log4j.Log4j2;
-
/**
* This service provides a number of utility methods to supplement/support the capabilities of the JDO Objectstore.
@@ -67,10 +62,8 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("DN5")
-@Log4j2
public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
-
@Override
public <T> T refresh(final T domainObject) {
final ObjectAdapter adapter = getPersistenceSession().adapterFor(domainObject);
@@ -217,9 +210,6 @@ public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
// //////////////////////////////////////
- @Inject IsisSessionFactory isisSessionFactory;
- @Inject ServiceInjector serviceInjector;
-
protected IsisPersistenceSessionJdo getPersistenceSession() {
return PersistenceSession.current(IsisPersistenceSessionJdo.class)
.getFirst()
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index 4b5db02..dccfc2f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -50,7 +50,6 @@ import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
* This service enables a serializable 'bookmark' to be created for an entity.
@@ -61,7 +60,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class BookmarkServiceInternalDefault implements BookmarkService, SerializingAdapter {
@Inject private SpecificationLoader specificationLoader;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
index 2690606..185f6db 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
@@ -30,14 +30,11 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandDefault;
import org.apache.isis.applib.services.command.spi.CommandService;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.CommandServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class CommandServiceDefault implements CommandService {
@Override
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
index d6aaeaa..d6eb8c8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
@@ -30,14 +30,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.EventBusServiceSpring")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Spring")
-@Log4j2
public class EventBusServiceSpring implements EventBusService {
@Inject private ApplicationEventPublisher applicationEventPublisher;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
index 49d8748..a8144c5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
@@ -46,14 +46,12 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._With.requires;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.FactoryServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class FactoryServiceDefault implements FactoryService {
@Inject IsisSessionFactory isisSessionFactory; // dependsOn
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
index 3c05814..79556a6 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
@@ -38,14 +38,11 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.TranslationServicePo")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Po")
-@Log4j2
public class TranslationServicePo implements TranslationService {
private PoAbstract po;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
index d546b15..192335b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
@@ -34,15 +34,15 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.MessageServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class MessageServiceDefault implements MessageService {
+
+ @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private TranslationService translationService;
@Override
public void informUser(final String message) {
@@ -118,7 +118,6 @@ public class MessageServiceDefault implements MessageService {
return isisSessionFactory.getCurrentSession().getAuthenticationSession().getMessageBroker();
}
- @Inject IsisSessionFactory isisSessionFactory;
- @Inject TranslationService translationService;
+
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
index 5c86cb0..42e67c4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
@@ -52,8 +52,6 @@ import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFa
import org.apache.isis.metamodel.services.publishing.PublisherDispatchService;
import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Wrapper around {@link PublisherService}. Is a no-op if there is no injected service.
*/
@@ -63,9 +61,15 @@ import lombok.extern.log4j.Log4j2;
@Primary
@RequestScoped
@Qualifier("Default")
-@Log4j2
public class PublisherDispatchServiceDefault implements PublisherDispatchService {
+ @Inject private List<PublisherService> publisherServices;
+ @Inject private ChangedObjectsService changedObjectsServiceInternal;
+ @Inject private CommandContext commandContext;
+ @Inject private InteractionContext interactionContext;
+ @Inject private ClockService clockService;
+ @Inject private UserService userService;
+ @Inject private MetricsService metricsService;
@Override
public void publishObjects() {
@@ -175,15 +179,6 @@ public class PublisherDispatchServiceDefault implements PublisherDispatchService
};
}
- // -- injected services
- @Inject List<PublisherService> publisherServices;
- @Inject
- ChangedObjectsService changedObjectsServiceInternal;
- @Inject CommandContext commandContext;
- @Inject InteractionContext interactionContext;
- @Inject ClockService clockService;
- @Inject UserService userService;
- @Inject MetricsService metricsService;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
index 3f9d33d..b270e08 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
@@ -48,11 +48,9 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisRuntimeServices.RepositoryServiceDefault")
-@Log4j2
public class RepositoryServiceDefault implements RepositoryService {
@Inject private FactoryService factoryService;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
index 42254cd..72ba62f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
@@ -27,12 +27,12 @@ import org.apache.isis.applib.services.routing.RoutingService;
import org.apache.isis.metamodel.services.homepage.HomePageResolverService;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Controller
@Named("isisRuntimeServices.RoutingServiceDefault")
-@Log4j2
public class RoutingServiceDefault implements RoutingService {
+
+ @Inject private HomePageResolverService homePageProviderService;
@Override
public boolean canRoute(final Object original) {
@@ -50,6 +50,6 @@ public class RoutingServiceDefault implements RoutingService {
: null;
}
- @Inject HomePageResolverService homePageProviderService;
+
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 43ccfef..9bc41b6 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -33,16 +33,16 @@ import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.SessionManagementServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class SessionManagementServiceDefault implements SessionManagementService {
+ @Inject private IsisSessionFactory isisSessionFactory;
+
@Override
public void nextSession() {
@@ -56,6 +56,6 @@ public class SessionManagementServiceDefault implements SessionManagementService
}
- @Inject IsisSessionFactory isisSessionFactory;
+
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
index f26a90f..3853366 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
@@ -33,14 +33,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.sudo.SudoService;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.SudoServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class SudoServiceDefault implements SudoService {
@Override
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
index bb269f0..1ec4c69 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
@@ -27,26 +27,22 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.userprof.UserProfileService;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRuntimeServices.UserProfileServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class UserProfileServiceDefault implements UserProfileService {
- @Programmatic
+ @Inject private AuthenticationSessionProvider authenticationSessionProvider;
+
@Override
public String userProfileName() {
return authenticationSessionProvider.getAuthenticationSession().getUserName();
}
- @Inject
- AuthenticationSessionProvider authenticationSessionProvider;
+
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
index ea50856..19554b8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -44,8 +44,6 @@ import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
import org.apache.isis.commons.internal.resources._Resources;
-import lombok.extern.log4j.Log4j2;
-
/**
* A service that sends email notifications when specific events occur
*/
@@ -54,10 +52,11 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class EmailNotificationServiceDefault implements EmailNotificationService {
private static final long serialVersionUID = 1L;
+
+ @Inject private EmailService emailService;
// -- CONSTANTS
@@ -164,9 +163,5 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
return message;
}
- // -- DEPENDENCIES
-
- @Inject private EmailService emailService;
-
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index 1fca5e8..d23696b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -33,8 +33,6 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.util.snapshot.XmlSnapshot;
-import lombok.extern.log4j.Log4j2;
-
/**
* This service allows an XML document to be generated capturing the data of a root entity and specified related
* entities. This XML can be used for various purposes, such as mail merge/reporting, or adhoc auditing.
@@ -49,7 +47,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
@Inject private SpecificationLoader specificationLoader;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
index b7dacef..f3f5f18 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.runtime.session.IsisSession;
-import lombok.extern.log4j.Log4j2;
-
/**
*
* @since 2.0
@@ -43,7 +41,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class RuntimeEventService {
@Inject private EventBusService eventBusService;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
index b818b71..2bd1dfd 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
@@ -29,8 +29,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import lombok.extern.log4j.Log4j2;
-
/**
*
* @since 2.0
@@ -41,13 +39,12 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class PersistenceEventService {
// -- MANAGED EVENTS
- @Inject Event<PreStoreEvent> preStoreEvents;
- @Inject Event<PostStoreEvent> postStoreEvents;
+ @Inject private Event<PreStoreEvent> preStoreEvents;
+ @Inject private Event<PostStoreEvent> postStoreEvents;
// -- PERSISTENT OBJECT EVENTS
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
index f5577aa..c1f62ed 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
@@ -34,16 +34,17 @@ import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntime.TimestampService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class TimestampService {
+ @Inject private UserService userService;
+ @Inject private ClockService clockService;
+
@EventListener(PreStoreEvent.class)
public void onPreStore(PreStoreEvent event) {
@@ -59,7 +60,4 @@ public class TimestampService {
}
- @Inject UserService userService;
- @Inject ClockService clockService;
-
}
\ No newline at end of file
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
index 9263f22..c05c0ef 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
@@ -42,7 +42,6 @@ import org.apache.isis.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
@@ -52,7 +51,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.HIGH)
@Primary
@Qualifier("Default")
-@Log4j2
public class AuditerDispatchService {
@Inject private List<AuditerService> auditerServices;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
index b905d55..c860eec 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
@@ -46,7 +46,6 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntime.ChangedObjectsService")
@@ -54,7 +53,6 @@ import lombok.extern.log4j.Log4j2;
@Primary
@Qualifier("Default")
@RequestScoped
-@Log4j2
public class ChangedObjectsService implements WithTransactionScope {
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
index 9152adc..3585252 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
@@ -1,11 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.Getter;
-
public class TransactionAfterBeginEvent extends TransactionEventAbstract {
+ private static final long serialVersionUID = 1L;
+
public TransactionAfterBeginEvent(final IsisTransactionObject source) {
super(source, Type.AFTER_BEGIN);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
index b4b7498..c60a448 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
@@ -1,12 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
-import java.util.EventObject;
-
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.Getter;
-
public class TransactionAfterCommitEvent extends TransactionEventAbstract {
+
+ private static final long serialVersionUID = 1L;
public TransactionAfterCommitEvent(final IsisTransactionObject source) {
super(source, Type.AFTER_COMMIT);
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
index 909c2a9..5aef274 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
@@ -1,13 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
-import java.util.EventObject;
-
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.Getter;
-
public class TransactionAfterRollbackEvent extends TransactionEventAbstract {
+ private static final long serialVersionUID = 1L;
+
public TransactionAfterRollbackEvent(final IsisTransactionObject source) {
super(source, Type.AFTER_ROLLBACK);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
index 4e24886..738a2e3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
@@ -1,8 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeBeginEvent extends TransactionEventAbstract {
+
+ private static final long serialVersionUID = 1L;
public TransactionBeforeBeginEvent(final IsisTransactionObject source) {
super(source, Type.BEFORE_BEGIN);
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
index cf972c6..871f2b1 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
@@ -1,13 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
-import java.util.EventObject;
-
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.Getter;
-
public class TransactionBeforeCommitEvent extends TransactionEventAbstract {
+ private static final long serialVersionUID = 1L;
+
public TransactionBeforeCommitEvent(final IsisTransactionObject source) {
super(source, Type.BEFORE_COMMIT);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
index 49a77d2..24e17c0 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
@@ -1,13 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
-import java.util.EventObject;
-
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.Getter;
-
public class TransactionBeforeRollbackEvent extends TransactionEventAbstract {
+ private static final long serialVersionUID = 1L;
+
public TransactionBeforeRollbackEvent(final IsisTransactionObject source) {
super(source, Type.BEFORE_ROLLBACK);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
index 0095145..ae1d15b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.runtime.persistence.transaction.events;
import java.util.EventObject;
@@ -8,6 +26,8 @@ import lombok.Getter;
public abstract class TransactionEventAbstract extends EventObject {
+ private static final long serialVersionUID = 1L;
+
public enum Type {
BEFORE_BEGIN,
AFTER_BEGIN,
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index cf9f437..e6c9032 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -44,8 +44,7 @@ import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionLayoutXmlDefaultTest {
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+ @Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
private ObjectActionDefault action;
@@ -54,7 +53,7 @@ public class ObjectActionLayoutXmlDefaultTest {
@Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
@Mock private SpecificationLoader mockSpecificationLoader;
- private MetaModelContext metaModelContext;
+ protected MetaModelContext metaModelContext;
@Before
public void setUp() throws Exception {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
index 1aa4c24..15721ea 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
@@ -115,6 +116,7 @@ public class OneToManyAssociationDefaultTest {
@Test
public void delegatesToUnderlying() {
final ObjectSpecification spec = association.getSpecification();
+ assertNotNull(spec); // looks like an incomplete testcase
}
@Test
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 6eac2a1..38d97fb 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -29,8 +29,6 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
-import lombok.extern.log4j.Log4j2;
-
/**
* Implementation that bypasses authentication.
*/
@@ -38,7 +36,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisSecurityBypass.AuthenticatorBypass")
@Order(OrderPrecedence.LOW)
@Qualifier("Bypass")
-@Log4j2
public class AuthenticatorBypass extends AuthenticatorAbstract {
@Override
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 2770b5a..0c1cce7 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -29,13 +29,10 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.security.api.authorization.standard.Authorizor;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisSecurityBypass.AuthorizorBypass")
@Order(OrderPrecedence.LOW)
@Qualifier("Bypass")
-@Log4j2
public class AuthorizorBypass implements Authorizor {
@Override
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index ebb6bc7..3f0197c 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -29,13 +29,10 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.security.api.authorization.standard.Authorizor;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisSecurityKeycloak.AuthorizorKeycloak")
@Order(OrderPrecedence.HIGH)
@Qualifier("Keycloak")
-@Log4j2
public class AuthorizorKeycloak implements Authorizor {
@Override
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index 51bc727..c3e70de 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.webapp.modules.WebModuleAbstract;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
/**
* WebModule to enable support for Keycloak.
@@ -44,7 +43,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisSecurityKeycloak.WebModuleKeycloak")
@Order(OrderPrecedence.HIGHEST + 100)
@Qualifier("Keycloak")
-@Log4j2
public final class WebModuleKeycloak extends WebModuleAbstract {
private final static String KEYCLOAK_FILTER_NAME = "KeycloakFilter";
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
index ba6b835..0a7bbbf 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
@@ -49,7 +49,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisSecurityShiro.AuthorizorShiro")
@Order(OrderPrecedence.HIGH)
@Qualifier("Shiro")
-@Log4j2
public class AuthorizorShiro implements Authorizor {
@Override
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 1204514..90261fa 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -53,7 +53,6 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
* WebModule to enable support for Shiro.
@@ -65,7 +64,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisSecurityKeycloak.WebModuleKeycloak")
@Order(OrderPrecedence.HIGHEST + 200)
@Qualifier("Shiro")
-@Log4j2
public class WebModuleShiro extends WebModuleAbstract {
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 69317c8..92debbb 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -41,7 +41,6 @@ import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
/**
* WebModule that provides the RestfulObjects Viewer.
@@ -52,7 +51,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisRoViewer.WebModuleJaxrsRestEasy4")
@Order(OrderPrecedence.MIDPOINT - 80)
@Qualifier("JaxrsRestEasy4")
-@Log4j2
public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
private static final String ISIS_SESSION_FILTER_FOR_RESTFUL_OBJECTS = "IsisSessionFilterForRestfulObjects";
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
index 66d7e25..2f2a80e 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
@@ -129,7 +129,7 @@ public class ActionResultReprRenderer extends ReprRendererAbstract<ActionResultR
final ResultType resultType,
final JsonRepresentation representation) {
- final ObjectSpecification returnType = this.action.getReturnType();
+ //final ObjectSpecification returnType = this.action.getReturnType();
switch (resultType) {
case VOID:
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 8a29500..96159d9 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -49,7 +49,6 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.apache.isis.commons.internal.base._With.requires;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
@@ -62,7 +61,6 @@ import lombok.extern.log4j.Log4j2;
@Primary
@Qualifier("Default")
@Singleton
-@Log4j2
public class JsonValueEncoder {
@Inject private SpecificationLoader specificationLoader;
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index 0cd0720..bf7b86f 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -43,15 +43,12 @@ import org.apache.isis.commons.internal.base._NullSafe;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisRoRendering.AcceptHeaderServiceForRest")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("ForRest")
@RequestScoped
-@Log4j2
public class AcceptHeaderServiceForRest implements AcceptHeaderService {
private static ThreadLocal<List<MediaType>> mediaTypesByThread = new ThreadLocal<>();
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index 4f929d9..2f42f8f 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -38,7 +38,6 @@ import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
@@ -230,7 +229,7 @@ public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiation
}
final ManagedObject returnedAdapter = objectAndActionInvocation.getReturnedAdapter();
- final ObjectSpecification returnType = objectAndActionInvocation.getAction().getReturnType();
+ //final ObjectSpecification returnType = objectAndActionInvocation.getAction().getReturnType();
if (returnedAdapter == null) {
return null;
@@ -249,7 +248,7 @@ public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiation
rootRepresentation = JsonRepresentation.newArray();
- final CollectionFacet collectionFacet = returnType.getFacet(CollectionFacet.class);
+ //final CollectionFacet collectionFacet = returnType.getFacet(CollectionFacet.class);
final Stream<ManagedObject> collectionAdapters =
CollectionFacet.Utils.streamAdapters(returnedAdapter);
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
index fc02f06..a7025dc 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
@@ -28,15 +28,12 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.extern.log4j.Log4j2;
-
import io.swagger.models.Swagger;
import io.swagger.util.Json;
import io.swagger.util.Yaml;
@Component
@Named("isisMetaModel.SwaggerSpecGenerator")
-@Log4j2
public class SwaggerSpecGenerator {
private final SpecificationLoader specificationLoader;
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index c28264d..262e9a5 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -27,11 +27,8 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Programmatic;
-import lombok.extern.log4j.Log4j2;
-
@Component
@Named("isisMetaModel.TaggerDefault")
-@Log4j2
public class TaggerDefault implements Tagger {
static Pattern tagSpringFramework = Pattern.compile("^org\\.springframework\\.([^\\.]+)\\.(.+)$");
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
index 783f93c..1c8bb61 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
@@ -30,6 +30,8 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.commons.internal.collections._Lists;
+import lombok.Getter;
+
@XmlRootElement(
name = "exceptionDetail"
)
@@ -49,16 +51,18 @@ public class ExceptionDetail {
return stackTraceElement.toString();
}
- private String className;
- private String message;
+ @Getter private String className;
+ @Getter private String message;
@XmlElementWrapper()
@XmlElement(name="element")
private List<String> stackTrace = _Lists.newArrayList();
- private ExceptionDetail causedBy;
+
+ @Getter private ExceptionDetail causedBy;
public ExceptionDetail() {
}
+
public ExceptionDetail(final Throwable ex) {
this.className = ex.getClass().getName();
this.message = ex.getMessage();
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
index 0992d42..1fba0a0 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
@@ -23,6 +23,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import lombok.Getter;
+
@XmlRootElement(
name = "exception"
)
@@ -35,9 +37,10 @@ import javax.xml.bind.annotation.XmlType;
}
)
@XmlAccessorType(XmlAccessType.FIELD)
+@Getter
public class ExceptionPojo {
- int httpStatusCode;
+ private int httpStatusCode;
private String message;
private ExceptionDetail detail;
@@ -48,8 +51,5 @@ public class ExceptionPojo {
this.message = message;
this.detail = detail;
}
-
- public String getMessage() {
- return message;
- }
+
}
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
index 474ea2d..3c0246e 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
@@ -63,9 +63,6 @@ public class ObjectAdapterAccessHelper {
public OneToOneAssociation getPropertyThatIsVisibleForIntent(
final String propertyId, final Intent intent) {
- //[ahuber] unused, any side-effects?
- final Where where = resourceContext.getWhere();
-
final ObjectAssociation association;
try {
final ObjectSpecification specification = objectAdapter.getSpecification();
@@ -86,9 +83,6 @@ public class ObjectAdapterAccessHelper {
public OneToManyAssociation getCollectionThatIsVisibleForIntent(
final String collectionId, final Intent intent) {
- //[ahuber] unused, any side-effects?
- final Where where = resourceContext.getWhere();
-
final ObjectAssociation association;
try {
final ObjectSpecification specification = objectAdapter.getSpecification();
@@ -107,9 +101,6 @@ public class ObjectAdapterAccessHelper {
public ObjectAction getObjectActionThatIsVisibleForIntent(
final String actionId, final Intent intent) {
- //[ahuber] unused, any side-effects?
- final Where where = resourceContext.getWhere();
-
final ObjectAction action;
try {
final ObjectSpecification specification = objectAdapter.getSpecification();
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
index 7505a55..aec6079 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
@@ -92,9 +92,7 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> {
addOrReplace(header);
- ManagedObject targetAdapter = null;
{
- targetAdapter = actionModel.getTargetAdapter();
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.PARAMETERS, getActionModel());
getComponentFactoryRegistry().addOrReplaceComponent(header, ComponentType.ENTITY_ICON_AND_TITLE, actionModel
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index bae6622..b9856f5 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -43,8 +43,6 @@ import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCol
import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import lombok.extern.log4j.Log4j2;
-
/**
* Default implementation of {@link PageClassList}, specifying the default pages
* for each of the {@link PageType}s.
@@ -54,7 +52,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class PageClassListDefault implements PageClassList {
private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index b946604..11dc8fd 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -38,8 +38,6 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
-import lombok.extern.log4j.Log4j2;
-
/**
* Default implementation of {@link PageClassRegistry}; just delegates to an
* underlying {@link PageClassList}.
@@ -49,14 +47,17 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class PageClassRegistryDefault implements PageClassRegistry, PageClassRegistrySpi {
private static final long serialVersionUID = 1L;
+ private final PageClassList pageClassList; // serializable
private final Map<PageType, Class<? extends Page>> pagesByType = _Maps.newHashMap();
-
- @Inject PageClassList pageClassList;
+
+ @Inject
+ public PageClassRegistryDefault(PageClassList pageClassList) {
+ this.pageClassList = pageClassList;
+ }
@PostConstruct
public void init() {
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
index dda75b2..a6b8d8a 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
@@ -37,8 +37,6 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Default implementation of {@link org.apache.isis.viewer.wicket.ui.pages.PageNavigationService}
*/
@@ -47,13 +45,11 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class PageNavigationServiceDefault implements PageNavigationService {
private static final long serialVersionUID = 1L;
- @Inject
- private PageClassRegistry pageClassRegistry;
+ @Inject private PageClassRegistry pageClassRegistry; // serializable
@Override
public void navigateTo(PageType pageType) {
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
index 130c7ad..6fed4dd 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
@@ -28,13 +28,10 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmarkui.BookmarkUiService;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisWicketViewer.BookmarkUiServiceWicket")
@Order(OrderPrecedence.HIGH)
@Qualifier("Wicket")
-@Log4j2
public class BookmarkUiServiceWicket implements BookmarkUiService {
@Override
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index 39766fa..8bccf7c 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -40,8 +40,6 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import lombok.extern.log4j.Log4j2;
-
/**
* An implementation of {@link org.apache.isis.applib.services.linking.DeepLinkService}
* for Wicket Viewer
@@ -50,7 +48,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisWicketViewer.DeepLinkServiceWicket")
@Order(OrderPrecedence.HIGH)
@Qualifier("Wicket")
-@Log4j2
public class DeepLinkServiceWicket implements DeepLinkService {
@Inject private PageClassRegistry pageClassRegistry;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
index f6f5aa2..aa9e560 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
@@ -44,8 +44,6 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.Specification;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import lombok.extern.log4j.Log4j2;
-
import images.Images;
/**
@@ -60,7 +58,6 @@ import images.Images;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("ClassPath")
-@Log4j2
public class ImageResourceCacheClassPath implements ImageResourceCache {
private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
index 562862c..cb1fdf8 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
@@ -32,8 +32,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.i18n.LocaleProvider;
-import lombok.extern.log4j.Log4j2;
-
/**
* An implementation that provides the locale of the current session.
@@ -42,7 +40,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisWicketViewer.LocaleProviderWicket")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Wicket")
-@Log4j2
public class LocaleProviderWicket implements LocaleProvider {
@Override
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
index 6525aa3..9f6811f 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
@@ -33,14 +33,12 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisWicketViewer.WicketViewerSettingsDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class WicketViewerSettingsDefault implements WicketViewerSettings {
private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 1239669..0cc706a 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -41,7 +41,6 @@ import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
/**
* WebModule that provides the Wicket Viewer.
@@ -51,7 +50,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisWicketViewer.WebModuleWicket")
@Order(OrderPrecedence.MIDPOINT - 80)
@Qualifier("Wicket")
-@Log4j2
public final class WebModuleWicket extends WebModuleAbstract {
private final static String WICKET_FILTER_NAME = "WicketFilter";
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
index 6a10a71..005f112 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
@@ -67,8 +67,7 @@ public class PageClassListDefault_Instantiation {
// -- HELPER
public static PageClassRegistryDefault newPageClassRegistryDefault(PageClassList pageClassList) {
- PageClassRegistryDefault pageClassRegistry = new PageClassRegistryDefault();
- pageClassRegistry.pageClassList = pageClassList;
+ PageClassRegistryDefault pageClassRegistry = new PageClassRegistryDefault(pageClassList);
pageClassRegistry.init();
return pageClassRegistry;
}
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
index 226fe5a..d869a18 100644
--- a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
+++ b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import lombok.experimental.UtilityClass;
-import lombok.extern.log4j.Log4j2;
/**
* Borrowed from BeansEndpoint.
@@ -41,7 +40,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisExtSpring.SpringBeansService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
-@Log4j2
public class SpringBeansService {
private final ConfigurableApplicationContext context;
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
index e2c4a2a..82a40fb 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
@@ -11,33 +11,24 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.annotation.Programmatic;
-
-import lombok.extern.log4j.Log4j2;
+import org.apache.isis.applib.services.clock.ClockService;
@Service
@Named("isisExtBase.calendarService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class CalendarService {
private static final int MONTHS_IN_QUARTER = 3;
-
-
- /**
- * @deprecated - use {@link org.apache.isis.applib.services.clock.ClockService#nowAsMillis()}.
- */
- @Deprecated
- @Programmatic
- public long timestamp() {
- return clockService.nowAsMillis();
- }
- // //////////////////////////////////////
+ private ClockService clockService;
+
+ @Inject
+ public CalendarService(ClockService clockService) {
+ this.clockService = clockService;
+ }
- @Programmatic
public LocalDate beginningOfMonth() {
return beginningOfMonth(clockService.now());
}
@@ -47,15 +38,11 @@ public class CalendarService {
return date.minusDays(dayOfMonth-1);
}
- // //////////////////////////////////////
-
- @Programmatic
public LocalDate beginningOfQuarter() {
final LocalDate date = clockService.now();
return beginningOfQuarter(date);
}
- @Programmatic
public LocalDate beginningOfNextQuarter() {
final LocalDate date = clockService.now().plusMonths(3);
return beginningOfQuarter(date);
@@ -69,6 +56,13 @@ public class CalendarService {
return beginningOfMonth.minusMonths(monthOfYear-monthStartOfQuarter);
}
- @Inject
- org.apache.isis.applib.services.clock.ClockService clockService;
+ /**
+ * @deprecated - use {@link org.apache.isis.applib.services.clock.ClockService#nowAsMillis()}.
+ */
+ @Deprecated
+ public long timestamp() {
+ return clockService.nowAsMillis();
+ }
+
+
}
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
index 42735c3..b40c299 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
@@ -48,8 +48,8 @@ public class CalendarServiceTest_beginningOfMonth {
}
};
- calendarService = new CalendarService();
- calendarService.clockService = stubClockService;
+ calendarService = new CalendarService(stubClockService);
+
}
@Test
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
index 03ed505..19d3c2c 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
@@ -61,8 +61,7 @@ public class CalendarServiceTest_beginningOfQuarter {
return now;
}
};
- calendarService = new CalendarService();
- calendarService.clockService = stubClockService;
+ calendarService = new CalendarService(stubClockService);
}
@Test
diff --git a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
index 72786d6..5daa6b5 100644
--- a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
+++ b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
@@ -29,7 +29,6 @@ import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.extensions.h2console.dom.webmodule.WebModuleH2Console;
@@ -43,18 +42,14 @@ import org.apache.isis.extensions.h2console.dom.webmodule.WebModuleH2Console;
)
public class H2ManagerMenu {
- private final ServiceRegistry serviceRegistry;
private final WebModuleH2Console webModule;
@Inject
- public H2ManagerMenu(final ServiceRegistry serviceRegistry, final WebModuleH2Console webModule) {
- this.serviceRegistry = serviceRegistry;
+ public H2ManagerMenu(final WebModuleH2Console webModule) {
this.webModule = webModule;
}
-
- public static class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<H2ManagerMenu>{
- private static final long serialVersionUID = 1L; }
+ public static class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<H2ManagerMenu>{}
@Action(
semantics = SemanticsOf.SAFE,
diff --git a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
index e7fb567..f6a19f6 100644
--- a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
+++ b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
@@ -42,13 +42,11 @@ import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtH2Console.WebModuleH2Console")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("H2Console")
-@Log4j2
public class WebModuleH2Console extends WebModuleAbstract {
private final static String SERVLET_NAME = "H2Console";
diff --git a/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index 11c5ef1..2d71633 100644
--- a/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++ b/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -45,17 +45,14 @@ import org.apache.isis.config.IsisConfiguration;
)
public class HsqlDbManagerMenu {
- private final IsisConfiguration isisConfiguration;
private final String url;
@Inject
public HsqlDbManagerMenu(IsisConfiguration isisConfiguration) {
- this.isisConfiguration = isisConfiguration;
- this.url = isisConfiguration.getPersistor().getDatanucleus().getImpl().getJavax().getJdo().getOption().getConnectionUrl();
+ this.url = isisConfiguration
+ .getPersistor().getDatanucleus().getImpl().getJavax().getJdo().getOption().getConnectionUrl();
}
-
-
public static class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<HsqlDbManagerMenu> { }
@Action(
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
index fc1205c..d99a18a 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
@@ -28,13 +28,10 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisExtSecman.PasswordEncryptionServiceUsingJBcrypt")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("JBCrypt")
-@Log4j2
public class PasswordEncryptionServiceUsingJBcrypt implements PasswordEncryptionService {
private String salt;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
index 3930949..4af0c4b 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
@@ -30,8 +30,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Optional hook for alternative implementations of {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission}.
*
@@ -66,7 +64,6 @@ public interface ApplicationPermissionFactory {
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
- @Log4j2
public static class Default implements ApplicationPermissionFactory {
@Override
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
index 39e3f97..52d0287 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
@@ -52,11 +52,9 @@ import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDe
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureType;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisExtSecman.applicationPermissionRepository")
-@Log4j2
public class ApplicationPermissionRepository
implements org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
index d27b367..ded694c 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
@@ -29,8 +29,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Optional hook so that alternative implementations of {@link org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole}.
*
@@ -65,7 +63,6 @@ public interface ApplicationRoleFactory {
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
- @Log4j2
public static class Default implements ApplicationRoleFactory {
@Override
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
index b9b7499..4506ddd 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
@@ -33,11 +33,8 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.collections._Lists;
-import lombok.extern.log4j.Log4j2;
-
@Repository
@Named("isisExtSecman.applicationRoleRepository")
-@Log4j2
public class ApplicationRoleRepository
implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
index 6f729a6..ae985d0 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
@@ -29,8 +29,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Optional hook so that alternative implementations of {@link org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancy}.
*
@@ -65,7 +63,6 @@ public interface ApplicationTenancyFactory {
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
- @Log4j2
public static class Default implements ApplicationTenancyFactory {
@Override
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
index 9dfec60..d322ec3 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
@@ -34,11 +34,8 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.collections._Lists;
-import lombok.extern.log4j.Log4j2;
-
@Repository
@Named("isisExtSecman.applicationTenancyRepository")
-@Log4j2
public class ApplicationTenancyRepository
implements org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
index 4c52e35..a833eba 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
@@ -29,8 +29,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
-import lombok.extern.log4j.Log4j2;
-
/**
* Optional hook so that alternative implementations of {@link org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUser}.
*
@@ -65,16 +63,15 @@ public interface ApplicationUserFactory {
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
- @Log4j2
public static class Default implements ApplicationUserFactory {
+ @Inject private FactoryService factory;
+
@Override
public ApplicationUser newApplicationUser() {
return factory.instantiate(ApplicationUser.class);
}
- @Inject FactoryService factory;
-
}
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
index de58cd4..e747653 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
@@ -29,25 +29,23 @@ import org.springframework.stereotype.Repository;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.query.QueryDefault;
-import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserStatus;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
-import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
-
-import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisExtSecman.applicationUserRepository")
-@Log4j2
public class ApplicationUserRepository
implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository {
+ @Inject private QueryResultsCache queryResultsCache;
+ @Inject private ApplicationUserFactory applicationUserFactory;
+ @Inject private RepositoryService repository;
+
// -- findOrCreateUserByUsername (programmatic)
/**
@@ -233,16 +231,6 @@ implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository
}
}
- // -- DEPENDENCIES
-
- @Inject QueryResultsCache queryResultsCache;
- @Inject PasswordEncryptionService passwordEncryptionService;
- @Inject ApplicationRoleRepository applicationRoleRepository;
- @Inject ApplicationUserFactory applicationUserFactory;
- @Inject RepositoryService repository;
- @Inject FactoryService factory;
-
-
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
index 6c8a750..a4eca7d 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
@@ -22,8 +22,6 @@ import javax.inject.Inject;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
-import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
-import org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.jdo.seed.scripts.GlobalTenancy;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisExtFixturesFixtureResultsRoleAndPermissions;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityAdminRoleAndPermissions;
@@ -41,8 +39,6 @@ import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityRegu
public class SeedUsersAndRolesFixtureScript extends FixtureScript {
@Inject private SecurityModuleConfig configBean;
- @Inject private ApplicationRoleRepository applicationRoleRepository;
- @Inject private ApplicationUserRepository applicationUserRepository;
@Override
protected void execute(ExecutionContext executionContext) {
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
index 79cf142..fb28b3d 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
@@ -32,13 +32,11 @@ import org.apache.isis.extensions.secman.api.SecurityRealmService;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtSecman.SecurityRealmServiceUsingShiro")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Shiro")
-@Log4j2
public class SecurityRealmServiceUsingShiro implements SecurityRealmService {
@Inject private ServiceInjector serviceInjector;
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
index 6ff1a85..be8d290 100644
--- a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
+++ b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
@@ -7,7 +7,7 @@ public class Comms extends AbstractRandomValueGenerator {
Comms(final FakeDataService fakeDataService) {
super(fakeDataService);
- final com.github.javafaker.Name name = fakeDataService.name().javaFakerName;
+ //final com.github.javafaker.Name name = fakeDataService.name().javaFakerName;
javaFakerInternet = fakeDataService.javaFaker().internet();
javaFakerPhoneNumber = fakeDataService.javaFaker().phoneNumber();
}
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
index 89f55b9..4153b2d 100644
--- a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
+++ b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
@@ -101,7 +101,7 @@ public class FakeDataService {
this.uuids = new Uuids(this);
this.isisPasswords = new IsisPasswords(this);
- this.isisMoneys = new IsisMoneys(this);
+ //this.isisMoneys = new IsisMoneys(this);
this.isisBlobs = new IsisBlobs(this);
this.isisClobs = new IsisClobs(this);
}
@@ -140,7 +140,7 @@ public class FakeDataService {
private Uuids uuids;
private IsisPasswords isisPasswords;
- private IsisMoneys isisMoneys;
+ //private IsisMoneys isisMoneys;
private IsisBlobs isisBlobs;
private IsisClobs isisClobs;
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
index ee14b7d..e06fc37 100644
--- a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
+++ b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
@@ -13,7 +13,6 @@ public class J8DateTimes extends AbstractRandomValueGenerator {
@Programmatic
public OffsetDateTime around(final Period period) {
- final OffsetDateTime now = fake.clockService.nowAsOffsetDateTime();
return fake.booleans().coinFlip() ? before(period) : after(period);
}
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
index df76eaf..5facc2b 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
@@ -34,18 +34,16 @@ import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisExtFixtures.FixturesLifecycleService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class FixturesLifecycleService {
- @Inject IsisSessionFactory isisSessionFactory; // depends on
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @SuppressWarnings("unused")
+ @Inject private IsisSessionFactory isisSessionFactory; // depends on relationship
+ @Inject private IsisSystemEnvironment isisSystemEnvironment;
@PostConstruct
public void postConstruct() {
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
index 70bc235..8a70209 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import lombok.extern.log4j.Log4j2;
-
/**
* Acts as a factory by the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts} when
@@ -45,7 +43,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class ExecutionParametersService {
public ExecutionParameters newExecutionParameters(final String parameters) {
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
index c157ee0..ec6248b 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
@@ -34,7 +34,9 @@ import org.apache.isis.commons.internal.collections._Maps;
* Instantiate using {@link FixtureScripts#newExecutionContext(String)}
*/
public class FixtureResultList {
-
+
+ private final FixtureScripts fixtureScripts;
+ private final FixtureScript.ExecutionContext executionContext;
// -- constructor
@@ -45,8 +47,6 @@ public class FixtureResultList {
this.executionContext = executionContext;
}
-
-
// -- list of FixtureResults
private final List<FixtureResult> list = _Lists.newArrayList();
@@ -136,18 +136,6 @@ public class FixtureResultList {
}
return _Casts.uncheckedCast(object);
}
-
-
-
- // -- injected services
-
- /**
- * Injected in {@link #FixtureResultList(FixtureScripts, org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext) constructor}.
- */
- private final FixtureScripts fixtureScripts;
- /**
- * Injected in {@link #FixtureResultList(FixtureScripts, org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext) constructor}.
- */
- private final FixtureScript.ExecutionContext executionContext;
+
}
\ No newline at end of file
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
index c71c420..b835a7e 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
@@ -32,8 +32,6 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.extensions.fixtures.events.FixturesInstalledEvent;
import org.apache.isis.extensions.fixtures.events.FixturesInstallingEvent;
-import lombok.extern.log4j.Log4j2;
-
/**
* In separate class because {@link QueryResultsCache} itself is request-scoped
@@ -43,7 +41,6 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class QueryResultsCacheControlDefault implements QueryResultCacheControl {
@EventListener(FixturesInstallingEvent.class)
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
index de6b48a..cb33df2 100644
--- a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
+++ b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.webapp.modules.WebModuleAbstract;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
/**
* WebModule providing support for Server Sent Events.
@@ -46,7 +45,6 @@ import lombok.extern.log4j.Log4j2;
@Named("isisExtSse.WebModuleServerSentEvents")
@Qualifier("ServerSentEvents")
@Order(OrderPrecedence.MIDPOINT)
-@Log4j2
public final class WebModuleServerSentEvents extends WebModuleAbstract {
private final static String SERVLET_NAME = "ServerSentEventsServlet";
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
index 684b1e6..ab99d4b 100644
--- a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
+++ b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
@@ -31,8 +31,6 @@ import org.apache.isis.applib.util.ToString;
@Deprecated
public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
- private static final long serialVersionUID = 1L;
-
// -- Default class
/**
* This class is the default for the
@@ -40,9 +38,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
* raises an event or not depends upon the <tt>isis.reflector.facet.actionAnnotation.domainEvent.postForDefault</tt>
* configuration property.
*/
- public static class Default extends ActionDomainEvent<Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Default extends ActionDomainEvent<Object> { }
// -- Noop class
@@ -51,9 +47,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event.
*/
- public static class Noop extends ActionDomainEvent<Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Noop extends ActionDomainEvent<Object> { }
// -- Doop class
@@ -62,9 +56,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event..
*/
- public static class Doop extends ActionDomainEvent<Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Doop extends ActionDomainEvent<Object> { }
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
index 582985b..18c61ec 100644
--- a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
+++ b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
@@ -25,9 +25,6 @@ import org.apache.isis.applib.util.ToString;
@Deprecated
public abstract class CollectionDomainEvent<S, T> extends AbstractDomainEvent<S> {
- private static final long serialVersionUID = 1L;
-
-
// -- Default class
/**
* This class is the default for the
@@ -35,9 +32,7 @@ public abstract class CollectionDomainEvent<S, T> extends AbstractDomainEvent<S>
* raises an event or not depends upon the <tt>isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault</tt>
* configuration property.
*/
- public static class Default extends CollectionDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Default extends CollectionDomainEvent<Object, Object> {}
// -- Noop class
@@ -46,9 +41,7 @@ public abstract class CollectionDomainEvent<S, T> extends AbstractDomainEvent<S>
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event.
*/
- public static class Noop extends CollectionDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Noop extends CollectionDomainEvent<Object, Object> {}
// -- Doop class
@@ -57,9 +50,7 @@ public abstract class CollectionDomainEvent<S, T> extends AbstractDomainEvent<S>
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event..
*/
- public static class Doop extends CollectionDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Doop extends CollectionDomainEvent<Object, Object> {}
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
index fd06231..8618a75 100644
--- a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
+++ b/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
@@ -24,8 +24,6 @@ import org.apache.isis.applib.util.ToString;
public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
- private static final long serialVersionUID = 1L;
-
// -- Default class
/**
* This class is the default for the
@@ -33,9 +31,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
* raises an event or not depends upon the <tt>isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault</tt>
* configuration property.
*/
- public static class Default extends PropertyDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Default extends PropertyDomainEvent<Object, Object> {}
// -- Noop class
@@ -44,9 +40,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event.
*/
- public static class Noop extends PropertyDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Noop extends PropertyDomainEvent<Object, Object> {}
// -- Doop class
@@ -55,9 +49,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
* property setting for the {@link Default} event..
*/
- public static class Doop extends PropertyDomainEvent<Object, Object> {
- private static final long serialVersionUID = 1L;
- }
+ public static class Doop extends PropertyDomainEvent<Object, Object> {}
// -- constructors