Clone Tools
  • last updated 28 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2126 aligning most pkg names for module 'metamodel'

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

    • -74
    • +0
    ./CollectionFacetOnStandaloneList.java
    • -31
    • +0
    ./DescribedAsFacetOnStandaloneList.java
    • -176
    • +0
    ./ObjectSpecificationOnStandaloneList.java
  1. … 3137 more files in changeset.
ISIS-2126 aligning package names in the 'config' module

    • -1
    • +1
    ./ObjectSpecificationOnStandaloneList.java
  1. … 211 more files in changeset.
ISIS-2112: inspecting whether the ObjectAdapterMemento is broken

- persistent object creation with wicket ui fails

generated object is expected to be persistent, but it remains transient;

could also be related to a missing transaction context;

- all around some fixes (I lost track)

- some minor improvements with 'demo'

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

    • -1
    • +1
    ./ObjectSpecificationOnStandaloneList.java
  1. … 98 more files in changeset.
ISIS-2112: starting to fix metamodel discovery issue

- simplifies spec loader code

- extends the realm of classes to be scanned by Spring

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

    • -3
    • +3
    ./ObjectSpecificationOnStandaloneList.java
  1. … 39 more files in changeset.
ISIS-2112: backporting from '2033-IoC_Spring' branch

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

    • -18
    • +8
    ./ObjectSpecificationOnStandaloneList.java
  1. … 1098 more files in changeset.
ISIS-2033: optimize ObjectSpec: decide sort once then treat immutable

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

    • -14
    • +5
    ./ObjectSpecificationOnStandaloneList.java
  1. … 8 more files in changeset.
Revert "ISIS-2033: intermediate breaking commit"

This reverts commit ded1cec9883aec14583a9709e408a1584ab2b53d.

    • -13
    • +16
    ./ObjectSpecificationOnStandaloneList.java
  1. … 140 more files in changeset.
ISIS-2033: intermediate breaking commit

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

    • -16
    • +13
    ./ObjectSpecificationOnStandaloneList.java
  1. … 140 more files in changeset.
ISIS-2033: move menus that depend on config from applib to runtime

also do some automatic organize imports

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

    • -2
    • +2
    ./ObjectSpecificationOnStandaloneList.java
  1. … 119 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

    • -4
    • +14
    ./ObjectSpecificationOnStandaloneList.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

    • -4
    • +12
    ./ObjectSpecificationOnStandaloneList.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
    • +5
    ./ObjectSpecificationOnStandaloneList.java
  1. … 468 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

    • -4
    • +13
    ./ObjectSpecificationOnStandaloneList.java
  1. … 74 more files in changeset.
ISIS-1976: cleaning up some raw types, unchecked casts and incomplete switches

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

    • -1
    • +3
    ./CollectionFacetOnStandaloneList.java
  1. … 46 more files in changeset.
ISIS-1976: rename ObjectAdapter.getObject() -> getPojo()

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

    • -1
    • +1
    ./CollectionFacetOnStandaloneList.java
    • -1
    • +1
    ./ObjectSpecificationOnStandaloneList.java
  1. … 114 more files in changeset.
ISIS-1976: generate element specification on the fly

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

    • -6
    • +17
    ./ObjectSpecificationOnStandaloneList.java
  1. … 10 more files in changeset.
ISIS-1976: move element spec. property from OA into ObjectSpecification

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

    • -0
    • +12
    ./ObjectSpecificationOnStandaloneList.java
  1. … 10 more files in changeset.
ISIS-1976: CollectionFacet API: remove contains(..)

improves memento one-to-many update performance

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

    • -5
    • +0
    ./CollectionFacetOnStandaloneList.java
  1. … 4 more files in changeset.
ISIS-1976: CollectionFacet API: make collection pojo creation a responsibility of the facet

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

    • -1
    • +2
    ./CollectionFacetOnStandaloneList.java
  1. … 4 more files in changeset.
ISIS-1976: rework CollectionFacet API such that methods invoked on non-scalar types preserves their generic type nature

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

    • -20
    • +24
    ./CollectionFacetOnStandaloneList.java
  1. … 28 more files in changeset.
ISIS-1976: introduces ManagedObject to replace OA within most of metamodel

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

    • -8
    • +4
    ./ObjectSpecificationOnStandaloneList.java
  1. … 141 more files in changeset.
ISIS-1976: cleanup CollectionData API

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

    • -2
    • +3
    ./CollectionFacetOnStandaloneList.java
  1. … 5 more files in changeset.
ISIS-1976: polishing 'Version' and 'ObjectSpecId'

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

    • -1
    • +1
    ./ObjectSpecificationOnStandaloneList.java
  1. … 16 more files in changeset.
ISIS-1976: ObjectSpecification.isViewModelCloneable(ObjectAdapter)

-> ObjectSpecification.isViewModelCloneable(Instance)

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

    • -1
    • +1
    ./ObjectSpecificationOnStandaloneList.java
  1. … 3 more files in changeset.
ISIS-1976: changes API ObjectSpecification.getIconName(ObjectAdapter)

-> ObjectSpecification.getIconName(Instance)

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

    • -1
    • +2
    ./ObjectSpecificationOnStandaloneList.java
  1. … 7 more files in changeset.
ISIS-1976: removing ObjectAdapter.replacePojo(Object pojo)

also cleaning up

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

    • -1
    • +2
    ./CollectionFacetOnStandaloneList.java
  1. … 8 more files in changeset.
ISIS-1976: remove deprecated ObjectSpecification.getTitle(ObjectAdapter)

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

    • -7
    • +3
    ./ObjectSpecificationOnStandaloneList.java
  1. … 4 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

    • -7
    • +7
    ./ObjectSpecificationOnStandaloneList.java
  1. … 1410 more files in changeset.
ISIS-1841 comments: further remove visual clutter

    • -6
    • +6
    ./ObjectSpecificationOnStandaloneList.java
  1. … 80 more files in changeset.
ISIS-1841 comments: reduce visual clutter

replace 'region .. endregion' comment markers with just headers

    • -6
    • +6
    ./ObjectSpecificationOnStandaloneList.java
  1. … 122 more files in changeset.