Clone Tools
  • last updated 16 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2265: simplifies adapter visibility processing

    • -6
    • +4
    ./method/ActionChoicesFacetViaMethod.java
    • -12
    • +7
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 8 more files in changeset.
ISIS-2265: refactoring CollectionUtils into CollectionFacet.Utils

    • -13
    • +7
    ./method/ActionChoicesFacetViaMethod.java
    • -11
    • +7
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 19 more files in changeset.
ISIS-2259: fixes up package name of isis-core-metamodel

    • -0
    • +38
    ./ActionChoicesFacet.java
    • -0
    • +36
    ./ActionChoicesFacetAbstract.java
    • -0
    • +42
    ./ActionParameterChoicesFacet.java
    • -0
    • +38
    ./ActionParameterChoicesFacetAbstract.java
    • -0
    • +48
    ./ActionParameterChoicesFacetNone.java
    • -0
    • +55
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -0
    • +55
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -0
    • +121
    ./method/ActionChoicesFacetViaMethod.java
    • -0
    • +100
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -0
    • +108
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -0
    • +99
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 3155 more files in changeset.
ISIS-2126 aligning most pkg names for module 'metamodel'

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

    • -37
    • +0
    ./ActionParameterChoicesFacetAbstract.java
    • -47
    • +0
    ./ActionParameterChoicesFacetNone.java
    • -54
    • +0
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -53
    • +0
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -119
    • +0
    ./method/ActionChoicesFacetViaMethod.java
    • -102
    • +0
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -103
    • +0
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -144
    • +0
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 3131 more files in changeset.
ISIS-2112: backporting from '2033-IoC_Spring' branch

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

    • -36
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -9
    • +2
    ./ActionParameterChoicesFacetNone.java
    • -9
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -18
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -34
    • +2
    ./method/ActionChoicesFacetViaMethod.java
    • -16
    • +1
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -8
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -16
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 1091 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

    • -2
    • +0
    ./method/ActionChoicesFacetViaMethod.java
  1. … 61 more files in changeset.
ISIS-2033: All MetaModel tests fixed.

However there is a lot of cleaning-up left to do.

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

    • -2
    • +2
    ./method/ActionChoicesFacetViaMethod.java
    • -2
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 66 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

    • -36
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -9
    • +2
    ./ActionParameterChoicesFacetNone.java
    • -9
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -18
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -38
    • +4
    ./method/ActionChoicesFacetViaMethod.java
    • -16
    • +1
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -10
    • +4
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -16
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 461 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
    • +1
    ./method/ActionChoicesFacetViaMethod.java
  1. … 74 more files in changeset.
ISIS-2040: module 'security': rename and align packages

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

    • -2
    • +2
    ./ActionParameterChoicesFacetAbstract.java
    • -1
    • +1
    ./ActionParameterChoicesFacetNone.java
    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -2
    • +2
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 212 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

    • -8
    • +0
    ./ActionParameterChoicesFacetAbstract.java
    • -3
    • +1
    ./ActionParameterChoicesFacetNone.java
    • -3
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -8
    • +0
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -3
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 124 more files in changeset.
Merge remote-tracking branch 'origin/master' into v2

    • -0
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -0
    • +7
    ./method/ActionChoicesFacetViaMethod.java
    • -0
    • +7
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 141 more files in changeset.
adds FacetWithAttributes interface

makes existing facets implement

    • -0
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -0
    • +7
    ./method/ActionChoicesFacetViaMethod.java
    • -0
    • +7
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 159 more files in changeset.
ISIS-1976: remove ObjectAdapter.Functions, also rename some OA Utilities

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

    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 39 more files in changeset.
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 314 more files in changeset.
ISIS-1976: removes OA map, stream for metamodel, excising guava

Key achievements:

Metamodel: almost all guava Function and Predicate idioms removed

Metamodel: slight API improvements, such that some of the internal meta-data that is kept in Java

Collections is no longer copied into immutable lists for any calling client, instead Java Streams are returned (which treat the underlying collections un-modifiable by design)

the ObjectAdapter per-session map/cache is history

the legacy modules have been removed, for convenince and ease of migration the legacy/transition-1-2- module remains and shall provide legacy glue code

shiro was moved to plugins, and its artifact renamed, to be inline with the other plugins

    • -2
    • +2
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -1
    • +0
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 556 more files in changeset.
ISIS-1976: further decouple from AdapterManager

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

    • -3
    • +3
    ./ActionParameterChoicesFacetNone.java
  1. … 23 more files in changeset.
    • -2
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -4
    • +4
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -3
    • +4
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 40 more files in changeset.
ISIS-1976: decouple metamodel's facets from AdapterManager

introduces ObjectAdapterProvider

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

    • -6
    • +6
    ./ActionParameterChoicesFacetAbstract.java
    • -4
    • +4
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -3
    • +3
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -8
    • +8
    ./method/ActionChoicesFacetViaMethod.java
    • -6
    • +6
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 76 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

    • -2
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -3
    • +3
    ./method/ActionChoicesFacetViaMethod.java
    • -2
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -10
    • +10
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 1405 more files in changeset.
ISIS-1949: Aligning Internal API package names with new home 'commons'

... org.apache.isis.commons.internal.*

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

    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -2
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 299 more files in changeset.
ISIS-1841 refining _Set and _List, and introducing _Reduction

also replacing lots of guava predicates

    • -6
    • +4
    ./method/ActionChoicesFacetViaMethod.java
    • -5
    • +3
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 34 more files in changeset.
ISIS-1846 consolidate uses of constants 'emptyObjects' + 'emptyClasses'

    • -1
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -1
    • +2
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -4
    • +5
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 12 more files in changeset.
ISIS-1408: removing RuntimeContext, ObjectSpecificationDependencies, ObjectMemberDependencies (WIP)

Also adding some micro-caching/helper methods in ServicesInjector (not sure if significant).

WIP - runs up ok, but unit tests failing.

    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 104 more files in changeset.
ISIS-1409: removing the *Aware interfaces for the internal components of RuntimeContext (PersistenceSession, Localization, MessageBroker, TranState), also removing AdapterManagerAware.

    • -12
    • +10
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -11
    • +11
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -13
    • +11
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 58 more files in changeset.
ISIS-1407: SpecificationLoader is now a concrete class (rolled ObjectReflector up into it).

    • -1
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -1
    • +1
    ./ActionParameterChoicesFacetNone.java
    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 152 more files in changeset.
ISIS-1194: reverting the move of AdapterManager and AdapterManagerAware, as unnecessarily breaks addons (devutils)

    • -1
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -1
    • +1
    ./ActionParameterChoicesFacetNone.java
    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -2
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -2
    • +2
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -2
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 138 more files in changeset.
ISIS-1194: moving AdapterManager interface to same package as other "runtimecontext" interfaces

    • -1
    • +1
    ./ActionParameterChoicesFacetAbstract.java
    • -1
    • +1
    ./ActionParameterChoicesFacetNone.java
    • -1
    • +1
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
    • -2
    • +2
    ./enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
    • -1
    • +1
    ./method/ActionChoicesFacetViaMethod.java
    • -2
    • +2
    ./method/ActionChoicesFacetViaMethodFactory.java
    • -1
    • +1
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
    • -2
    • +2
    ./methodnum/ActionParameterChoicesFacetViaMethodFactory.java
  1. … 138 more files in changeset.
ISIS-1044: allow null adapters to be in the list of adapters being filtered.

    • -3
    • +0
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 1 more file in changeset.
ISIS-1044: remove DeploymentCategory, AuthenticationSession from the InteractionContext class hierarchy.

...refactoring any remaining usages of these fields to instead be injected via constructor:

- DisableForSessionFacetAbstract

- HideForSessionFacetAbstract

- ExplorationFacetAbstract

- PrototypeFacetAbstract

Also:

- reorder the remaining parameters in the constructors of InteractionContext and its subclasses.

    • -1
    • +0
    ./method/ActionChoicesFacetViaMethod.java
    • -1
    • +0
    ./methodnum/ActionParameterChoicesFacetViaMethod.java
  1. … 64 more files in changeset.