Clone Tools
  • last updated 14 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-1970: introduces EditingFacet

    • -65
    • +77
    ./DeriveFacetsPostProcessor.java
  1. … 13 more files in changeset.
ISIS-1970: fixes 2 issues ...

1. global editing option overrides type level edition option

2. type level editing disabled reason does not get propagated to

properties

  1. … 6 more files in changeset.
ISIS-2223: use ImmutableEnumSet<ActionType> when applicable

  1. … 8 more files in changeset.
ISIS-2223: don't call Optional.get() (analyzer fails to detect guard)

also renames the Can.getOrThrow() -> getElseFail()

  1. … 12 more files in changeset.
ISIS-2158: CollectionFacet is in the wrong package ... move

    • -1
    • +1
    ./ActionParameterChoicesFacetFromParentedCollection.java
  1. … 27 more files in changeset.
ISIS-2223: Mitigate Reliability and Security Issues as detected by Code Quality Analysis

Task-Url: https://issues.apache.org/jira/browse/ISIS-2223

    • -1
    • +1
    ./ActionParameterDefaultsFacetFromAssociatedCollection.java
  1. … 2 more files in changeset.
ISIS-2265: refactoring CollectionUtils into CollectionFacet.Utils

    • -2
    • +1
    ./ActionParameterChoicesFacetFromParentedCollection.java
  1. … 20 more files in changeset.
ISIS-2263: bump schema XSDs to v2/2.0

    • -1
    • +1
    ./ActionParameterChoicesFacetFromParentedCollection.java
    • -24
    • +24
    ./DeriveFacetsPostProcessor.java
  1. … 270 more files in changeset.
ISIS-2259: fixes up package name of isis-core-metamodel

    • -0
    • +76
    ./ActionParameterChoicesFacetFromParentedCollection.java
    • -0
    • +64
    ./ActionParameterDefaultsFacetFromAssociatedCollection.java
    • -0
    • +635
    ./DeriveFacetsPostProcessor.java
  1. … 3163 more files in changeset.
ISIS-2126 aligning most pkg names for module 'metamodel'

- o.a.i.core.metamodel.* -> o.a.i.metamodel.*

    • -72
    • +0
    ./ActionParameterChoicesFacetFromParentedCollection.java
    • -66
    • +0
    ./ActionParameterDefaultsFacetFromAssociatedCollection.java
    • -614
    • +0
    ./DeriveFacetsPostProcessor.java
  1. … 3139 more files in changeset.
merge 'master' into '2112_SpringBoot'

  1. … 9 more files in changeset.
ISIS-2118: removes dead code that is no longer called

ISIS-2118: no need for ImmutableFacet on properties/collections

since we have a DerivedFacet instead

ISIS-2112: backporting from '2033-IoC_Spring' branch

Task-Url: https://issues.apache.org/jira/browse/ISIS-2112

    • -8
    • +3
    ./ActionParameterChoicesFacetFromParentedCollection.java
    • -34
    • +10
    ./DeriveFacetsPostProcessor.java
  1. … 1097 more files in changeset.
ISIS-2001: caters for dependent defaults returning collection, also makes logic for recomputing default more sophisticated...

... based on *which* previous parameter actually changed.

    • -1
    • +4
    ./ActionParameterDefaultsFacetFromAssociatedCollection.java
  1. … 12 more files in changeset.
  1. … 51 more files in changeset.
Merge remote-tracking branch 'origin/v2' into 2033-IoC

Conflicts:

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_validateServices.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 12 more files in changeset.
Merge branch 'master' into v2

  1. … 12 more files in changeset.
ISIS-1280: introduces ProjectionFacet at the object level, to simplify entityIcon UI,

and also derives title, icon and cssClass facets from the underlying 'projected' property, if present

  1. … 16 more files in changeset.
Merge branch 'v2' into 2033-IoC

Conflicts:

core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java

core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/pom.xml

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 38 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

# core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

# core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java

# core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

# example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

  1. … 61 more files in changeset.
ISIS-2033: Major: MetaModel refactoring

removing instances of 'ServicesInjector' being passed around in

constructors

removing 'ServicesInjectorAware' interface

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -8
    • +3
    ./ActionParameterChoicesFacetFromParentedCollection.java
  1. … 467 more files in changeset.
ISIS-2050: reworks order and depth of introspection.

Squashed from previous commits:

ISIS-2050: uses simpler overload that defaults IntrospectionState to TYPE_INTROSPECTED.

Also introduces overload for className as well as Class<?>

ISIS-2050: only contribute to entities and view models; improves MetaModel exporter

to also dump out the facets of any "discovered" domain types.

ISIS-2050: load specs only to TYPE (not MEMBERS) everywhere; only adds described as facet (derived from type) if is do-op.

ISIS-2050: fixes for unit tests and reorder introspection slightly in order to fix lockdown

ISIS-2050: adds ValueFacet for Joda LocalTime

Uses a very simple implementation, because I suspect that the other capabilities of ValueFacet simply aren't needed anymore...

ISIS-2050:

- removes contributingDomainServiceTypes from AppManifest.Registry once more ... will just eagerly introspect type and members for all domain services

- fixes introspectUpTo algorithm

- skip type hierarchy traversal for domain services with natureOfService=DOMAIN

- improves/reduces logging

- lazily introspect up to type and members whenever any of the members (properties/collections/actions) are referenced of an ObjectSpecAbstract

ISIS-2050: introduces config property to enable/disable full introspection of metamodel

If disabled, then metamodel validation is skipped

ISIS-2050: moves introspectObjectSpecId() so called directly from constructor of ObjectSpec.

ISIS-2050: postProcessor now called by ObjectSpecAbstract after fully introspected, rather than by SpecificationLoader

ISIS-2050: passes PostProcessor into ObjectSpecificationAbstract's constructor

ISIS-2050: scales back the depth of introspection when introspecting members

- only need to introspect the type for parameters and return types.

ISIS-2050: removes SpecificationLoader#state; now responsibility of each ObjectSpecification to keep track of its own introspectionState.

ISIS-2050: eagerly introspects contributing specs, lazily introspecs the remainder.

ISIS-2050: updates AppManifest.Registry to also hold all contributingDomainServiceTypes

This is so that we can eagerly build the ObjectSpecs for these types and mixins, but leave everything else to be built lazily.

ISIS-2050: when traversing type hierarchy, now only introspect super types up to the TYPE, not their MEMBERs as well.

ISIS-2050: renames two of the IntrospectionStates

ISIS-2050: pulls upTo introspectionState into a parameter for all of SpecificationLoaders methods

... so that the caller can decide the level of introspection that needs to be performed.

ISIS-2050: extends IntrospectionState with additional states for type vs member introspection; inlining methods to simplify

... with the aim of exposing the IntrospectionState upTo so can pass through and honour the phases.

Removed the guards in introspectTypeHierarchy, don't think they are needed any more since only ever called from its caller which checks the introspectionState anyway

ISIS-2050: breaks out introspectTypeHierarchyAndMembers into two.

ISIS-2050: replaces IntrospectionStrategy with the concept of introspecting "up to" a certain state.

ISIS-2050: refactors responsibilities of SpecLoader vs ObjectSpec

just the management of introspectionState on ObjectSpec

ISIS-2050: introduces ObjectSpecIdFacetFactory

and additional process(ProcessObjectSpecIdContext) for FacetProcessor

  1. … 74 more files in changeset.
ISIS-2040: module 'security': rename and align packages

Task-Url: https://issues.apache.org/jira/browse/ISIS-2040

    • -1
    • +1
    ./ActionParameterChoicesFacetFromParentedCollection.java
  1. … 215 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc

# core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java

# core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPostsPropertyChangedEventAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyInteractionAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java

    • -0
    • +132
    ./DeriveFacetsPostProcessor.java
  1. … 38 more files in changeset.
ISIS-2043: adds support for @DomainObject(xxxDomainEvent=...) for mixins

whereby will honour the domain event specified if not otherwise annotated.

In fact, this contains a few other fixes:

* previously, although mixin actions did emit domain events for all phases (hide/disable/validate/executing/executed), mixin properties and mixin collections emitted none. Now this is fixed so that the emit domain events for the first two phases (hide/disable). It doesn't make sense to emit them for the remainder because mixin props/colls are always derived (are read-only queries under the covers).

* also, getMixedIn() now promoted from ActionDomainEvent up to AbstractDomainEvent

* also, added similar getSubject() (a simple wrapper around getSource() and getMixedIn()) also in AbstractDomainEvent.

    • -0
    • +137
    ./DeriveFacetsPostProcessor.java
  1. … 16 more files in changeset.
ISIS-1991: cleanup: use _Context.isPrototyping() everywhere (framework internal)

this is exposed by IsisContext.getEnvironment() as part of the public

API

Task-Url: https://issues.apache.org/jira/browse/ISIS-1991

  1. … 18 more files in changeset.
ISIS-1991: major: removing the DeploymentCategory

also rolling up RenderContext2-6

Task-Url: https://issues.apache.org/jira/browse/ISIS-1991

    • -3
    • +1
    ./ActionParameterChoicesFacetFromParentedCollection.java
  1. … 130 more files in changeset.
Merge remote-tracking branch 'origin/master' into v2

# Conflicts:

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

    • -0
    • +506
    ./DeriveFacetsPostProcessor.java
  1. … 1 more file in changeset.
ISIS-1974: renames post processor for spec loader

    • -509
    • +0
    ./ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
    • -0
    • +507
    ./DeriveFacetsPostProcessor.java
  1. … 1 more file in changeset.