You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/05/20 00:44:41 UTC
[04/30] isis git commit: ISIS-1407: collapsed SpecificationLoaderSpi
and SpecificationLoader interfaces; removed ProgrammableReflector (finally!)
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index d65906a..b26fe09 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -97,10 +97,10 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {
{
- allowing(mockSpecificationLoaderSpi).loadSpecification(cls);
+ allowing(mockSpecificationLoader).loadSpecification(cls);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoaderSpi).loadSpecification(returnType);
+ allowing(mockSpecificationLoader).loadSpecification(returnType);
will(returnValue(mockReturnTypeSpec));
}
});
@@ -109,7 +109,7 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
@Before
public void setUp() throws Exception {
facetFactory = new CollectionAnnotationFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
}
@After
@@ -122,7 +122,7 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
private void addGetterFacet(final FacetHolder holder) {
FacetUtil.addFacet(new PropertyOrCollectionAccessorFacetAbstract(holder, mockDeploymentCategoryProvider.getDeploymentCategory(),
mockConfiguration,
- mockSpecificationLoaderSpi, mockAuthenticationSessionProvider,
+ mockSpecificationLoader, mockAuthenticationSessionProvider,
mockAdapterManager
) {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
index 666cd14..8b496fb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
@@ -35,7 +35,7 @@ public class CssClassAnnotationOnMemberFacetFactoryTest extends AbstractFacetFac
public void testCssClassAnnotationPickedUpOnProperty() {
final CssClassFacetOnMemberFactory facetFactory = new CssClassFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
index 7ded344..4fa0310 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
@@ -46,7 +46,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnClass() {
final NamedFacetOnTypeAnnotationFactory facetFactory = new NamedFacetOnTypeAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
@Named("some name")
class Customer {
@@ -67,7 +67,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnProperty() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -91,7 +91,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnCollection() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -115,7 +115,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnAction() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -139,7 +139,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnActionParameter() {
final NamedFacetOnParameterAnnotationFactory facetFactory = new NamedFacetOnParameterAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
index ad51b32..3e2dd1c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
@@ -41,7 +41,7 @@ public class CssClassFacetOnTypeAnnotationFactoryTest extends AbstractFacetFacto
public void testCssClassAnnotationPickedUpOnClass() {
final CssClassFacetOnTypeAnnotationFactory facetFactory = new CssClassFacetOnTypeAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
@CssClass("testClass")
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/CssClassFaFacetOnTypeAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/CssClassFaFacetOnTypeAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/CssClassFaFacetOnTypeAnnotationFactoryTest.java
index 9b0f564..153a084 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/CssClassFaFacetOnTypeAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/CssClassFaFacetOnTypeAnnotationFactoryTest.java
@@ -24,7 +24,7 @@ public class CssClassFaFacetOnTypeAnnotationFactoryTest extends AbstractFacetFac
// public void testCssClassFaAnnotationPickedUpOnClass() {
//
// final CssClassFaFacetOnTypeAnnotationFactory facetFactory = new CssClassFaFacetOnTypeAnnotationFactory();
- // facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ // facetFactory.setSpecificationLoader(mockSpecificationLoader);
//
// @CssClassFa("fa-foo")
// class Customer {
@@ -47,7 +47,7 @@ public class CssClassFaFacetOnTypeAnnotationFactoryTest extends AbstractFacetFac
// public void testCssClassFaAnnotationPickedUpOnClassPositionRight() {
//
// final CssClassFaFacetOnTypeAnnotationFactory facetFactory = new CssClassFaFacetOnTypeAnnotationFactory();
- // facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ // facetFactory.setSpecificationLoader(mockSpecificationLoader);
//
// @CssClassFa(value = "fa-foo", position = ActionLayout.CssClassFaPosition.RIGHT)
// class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index f039b70..3fbc59c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -66,11 +66,11 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
@Before
public void setUp() throws Exception {
- context.allowing(mockSpecificationLoaderSpi);
+ context.allowing(mockSpecificationLoader);
facetFactory = new TitleAnnotationFacetFactory();
facetFactory.setAdapterManager(mockAdapterManager);
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations() {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 5c3fa6f..6906fcf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -38,7 +38,7 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFa
@Before
public void setUp() throws Exception {
facetFactory = new ObjectSpecIdFacetDerivedFromClassNameFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
}
public static class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 384e95f..3877ba4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -66,10 +66,10 @@ public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUn
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {{
- allowing(mockSpecificationLoaderSpi).loadSpecification(cls);
+ allowing(mockSpecificationLoader).loadSpecification(cls);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoaderSpi).loadSpecification(returnType);
+ allowing(mockSpecificationLoader).loadSpecification(returnType);
will(returnValue(mockReturnTypeSpec));
}});
}
@@ -77,7 +77,7 @@ public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUn
@Before
public void setUp() throws Exception {
facetFactory = new ParameterAnnotationFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index 7c8b0e6..db67707 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -93,7 +93,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract facetFactory) {
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
}
@@ -242,7 +242,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testModifyMethodWithNoSetterInstallsNotPersistedFacetButDoesNotInstallADisabledFacets() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@@ -253,7 +253,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisabledFacetOnPropertyInferredFactory disabledFacetOnPropertyInferredFactory = new DisabledFacetOnPropertyInferredFactory();
- disabledFacetOnPropertyInferredFactory.setSpecificationLoader(programmableReflector);
+ disabledFacetOnPropertyInferredFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -282,7 +282,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testIfHaveSetterAndModifyFacetThenTheModifyFacetWinsOut() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
@@ -417,7 +417,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testAutoCompleteFacetFoundAndMethodRemoved() {
final PropertyAutoCompleteFacetMethodFactory facetFactory = new PropertyAutoCompleteFacetMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 5cf5139..03499be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -104,10 +104,10 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
void allowingLoadSpecificationRequestsFor(final Class<?> cls, final Class<?> returnType) {
context.checking(new Expectations() {{
- allowing(mockSpecificationLoaderSpi).loadSpecification(cls);
+ allowing(mockSpecificationLoader).loadSpecification(cls);
will(returnValue(mockTypeSpec));
- allowing(mockSpecificationLoaderSpi).loadSpecification(returnType);
+ allowing(mockSpecificationLoader).loadSpecification(returnType);
will(returnValue(mockReturnTypeSpec));
}});
}
@@ -115,7 +115,7 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
@Before
public void setUp() throws Exception {
facetFactory = new PropertyAnnotationFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
}
@@ -129,7 +129,7 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
private void addGetterFacet(final FacetHolder holder) {
FacetUtil.addFacet(new PropertyOrCollectionAccessorFacetAbstract(holder, mockDeploymentCategoryProvider.getDeploymentCategory(),
mockConfiguration,
- mockSpecificationLoaderSpi, mockAuthenticationSessionProvider,
+ mockSpecificationLoader, mockAuthenticationSessionProvider,
mockAdapterManager
) {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
index 99b4457..272b7fc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
@@ -45,12 +45,14 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
protected void setUp() throws Exception {
super.setUp();
- programmableReflector.setLoadSpecificationStringReturn(customerNoSpec);
+ // mockSpecificationLoader.setLoadSpecificationStringReturn(customerNoSpec);
+ allowing_specificationLoader_loadSpecification_any_willReturn(customerNoSpec);
+
}
public void testMaskAnnotationPickedUpOnClass() {
final MaskFacetOnTypeAnnotationFactory facetFactory = new MaskFacetOnTypeAnnotationFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
@Mask("###")
class Customer {
@@ -66,7 +68,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationPickedUpOnProperty() {
final MaskFacetOnPropertyAnnotationFactory facetFactory = new MaskFacetOnPropertyAnnotationFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -88,7 +90,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationPickedUpOnActionParameter() {
final MaskFacetOnParameterAnnotationFactory facetFactory = new MaskFacetOnParameterAnnotationFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -108,7 +110,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationNotIgnoredForNonStringsProperty() {
final MaskFacetOnPropertyAnnotationFactory facetFactory = new MaskFacetOnPropertyAnnotationFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -126,7 +128,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationNotIgnoredForPrimitiveOnActionParameter() {
final MaskFacetOnParameterAnnotationFactory facetFactory = new MaskFacetOnParameterAnnotationFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 72a6d61..5b44f54 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFa
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -74,7 +74,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
@Mock
protected AdapterManager mockAdapterManager;
@Mock
- protected SpecificationLoaderSpi mockSpecificationLoader;
+ protected SpecificationLoader mockSpecificationLoader;
@Mock
protected AuthenticationSessionProvider mockAuthenticationSessionProvider;
@Mock
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index c3c1cb4..9c124d5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetU
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -183,7 +183,7 @@ public class ObjectFixtureFilePersistor {
return IsisContext.getPersistenceSession();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
@@ -220,7 +220,7 @@ class LoadedObjects {
return IsisContext.getPersistenceSession();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index d29db42..f8599f7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -399,7 +399,7 @@ public class Memento implements Serializable {
// Dependencies (from context)
// ///////////////////////////////////////////////////////////////
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
index 784d58e..acbbe6f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -115,7 +115,7 @@ public class DomainObjectContainerResolve {
return getPersistenceSession();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index cfad852..f6df1e4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAb
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.transactions.TransactionState;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -69,7 +69,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
- final SpecificationLoaderSpi specificationLoader) {
+ final SpecificationLoader specificationLoader) {
super(servicesInjector, specificationLoader);
this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index 662e9c3..f46eb2d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
@@ -128,7 +128,7 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
// Dependencies (from context)
// ///////////////////////////////////////////////////////
- protected static SpecificationLoaderSpi getSpecificationLoader() {
+ protected static SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 6ed82fd..c93e844 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -293,7 +293,7 @@ public class BackgroundServiceDefault implements BackgroundService2 {
// //////////////////////////////////////
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index 2aef5d5..3022223 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -241,7 +241,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
// //////////////////////////////////////
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 04b2f5c..d65e23d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInterna
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -164,8 +164,8 @@ public class IsisSystem implements ApplicationScopedComponent {
final Collection<MetaModelRefiner> metaModelRefiners =
refiners(authenticationManager, authorizationManager,
new PersistenceSessionFactoryMetamodelRefiner());
- final SpecificationLoaderSpi specificationLoader =
- isisComponentProvider.provideSpecificationLoaderSpi(deploymentType, servicesInjector, metaModelRefiners);
+ final SpecificationLoader specificationLoader =
+ isisComponentProvider.provideSpecificationLoader(deploymentType, servicesInjector, metaModelRefiners);
// persistenceSessionFactory
final PersistenceSessionFactory persistenceSessionFactory =
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index 83e209e..34f9032 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.system;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
@@ -45,7 +45,7 @@ public final class SystemConstants {
/**
- * Key used to lookup {@link SpecificationLoaderSpi specification Loader} in
+ * Key used to lookup {@link SpecificationLoader specification Loader} in
* {@link IsisConfiguration}, and root for any
* {@link ObjectReflectorInstaller reflector}-specific configuration keys.
*
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 32afbc6..885e841 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationException;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationDefault;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.system.DeploymentType;
@@ -406,7 +406,7 @@ public class IsisContext {
*
* @see IsisSessionFactory#getSpecificationLoader()
*/
- public static SpecificationLoaderSpi getSpecificationLoader() {
+ public static SpecificationLoader getSpecificationLoader() {
return getSessionFactory().getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 1dc25ca..c2dcad5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -98,7 +98,7 @@ import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.FreeStandingList;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -181,7 +181,7 @@ public class PersistenceSession implements
private final PersistenceQueryFactory persistenceQueryFactory;
private final IsisConfigurationDefault configuration;
- private final SpecificationLoaderSpi specificationLoader;
+ private final SpecificationLoader specificationLoader;
private final AuthenticationSession authenticationSession;
private final ServicesInjectorSpi servicesInjector;
@@ -217,7 +217,7 @@ public class PersistenceSession implements
public PersistenceSession(
final IsisConfigurationDefault configuration,
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader,
+ final SpecificationLoader specificationLoader,
final AuthenticationSession authenticationSession,
final PersistenceManagerFactory jdoPersistenceManagerFactory,
final FixturesInstalledFlag fixturesInstalledFlag) {
@@ -1239,7 +1239,7 @@ public class PersistenceSession implements
//region > dependencies (from constructor)
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return specificationLoader;
}
protected AuthenticationSession getAuthenticationSession() {
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index df138b0..ec15042 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
@@ -163,7 +163,7 @@ public class PersistenceSessionFactory
*/
public PersistenceSession createPersistenceSession(
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader,
+ final SpecificationLoader specificationLoader,
final AuthenticationSession authenticationSession) {
final FixturesInstalledFlag fixturesInstalledFlag = this;
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
index 55e108b..892f2d4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.util.ToString;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
@@ -142,7 +142,7 @@ public class IsisSession implements SessionScopedComponent {
/**
* Convenience method.
*/
- public SpecificationLoaderSpi getSpecificationLoader() {
+ public SpecificationLoader getSpecificationLoader() {
return isisSessionFactory.getSpecificationLoader();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 9b4d08a..761a6ed 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
@@ -68,7 +68,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
private final DeploymentType deploymentType;
private final IsisConfiguration configuration;
- private final SpecificationLoaderSpi specificationLoaderSpi;
+ private final SpecificationLoader specificationLoaderSpi;
private final ServicesInjectorSpi servicesInjector;
private final AuthenticationManager authenticationManager;
private final AuthorizationManager authorizationManager;
@@ -79,7 +79,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
final DeploymentType deploymentType,
final IsisConfiguration configuration,
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader,
+ final SpecificationLoader specificationLoader,
final AuthenticationManager authenticationManager,
final AuthorizationManager authorizationManager,
final PersistenceSessionFactory persistenceSessionFactory) {
@@ -165,9 +165,9 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
/**
* The {@link ApplicationScopedComponent application-scoped}
- * {@link SpecificationLoaderSpi}.
+ * {@link SpecificationLoader}.
*/
- public SpecificationLoaderSpi getSpecificationLoader() {
+ public SpecificationLoader getSpecificationLoader() {
return specificationLoaderSpi;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 6916be9..27a31af 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
@@ -50,7 +50,7 @@ public interface IsisComponentProvider {
FixturesInstaller provideFixturesInstaller();
- SpecificationLoaderSpi provideSpecificationLoaderSpi(
+ SpecificationLoader provideSpecificationLoader(
final DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners)
@@ -59,6 +59,6 @@ public interface IsisComponentProvider {
PersistenceSessionFactory providePersistenceSessionFactory(
final DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader);
+ final SpecificationLoader specificationLoader);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 214a362..0c364ad 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFr
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
@@ -225,7 +225,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
}
@Override
- public SpecificationLoaderSpi provideSpecificationLoaderSpi(
+ public SpecificationLoader provideSpecificationLoader(
final DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
@@ -258,7 +258,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
public PersistenceSessionFactory providePersistenceSessionFactory(
DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader) {
+ final SpecificationLoader specificationLoader) {
DataNucleusPersistenceMechanismInstaller installer =
new DataNucleusPersistenceMechanismInstaller(configuration);
return installer.createPersistenceSessionFactory(
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index e43c9e6..db407ce 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
@@ -159,7 +159,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProviderA
@Override
- public SpecificationLoaderSpi provideSpecificationLoaderSpi(
+ public SpecificationLoader provideSpecificationLoader(
final DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) {
@@ -172,7 +172,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProviderA
public PersistenceSessionFactory providePersistenceSessionFactory(
final DeploymentType deploymentType,
final ServicesInjectorSpi servicesInjector,
- final SpecificationLoaderSpi specificationLoader) {
+ final SpecificationLoader specificationLoader) {
return persistenceMechanismInstaller.createPersistenceSessionFactory(
deploymentType,
servicesInjector);
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
index 5b2ea63..e29190e 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.InstallerAbstract;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -74,7 +74,7 @@ public class DataNucleusPersistenceMechanismInstaller extends InstallerAbstract
//region > dependencies
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index 1df7289..46d8766 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -35,7 +35,7 @@ import org.datanucleus.identity.DatastoreId;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
@@ -216,7 +216,7 @@ public final class JdoObjectIdSerializer {
return correspondingClass;
}
- private static SpecificationLoaderSpi getSpecificationLoader() {
+ private static SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index 70fe50c..70d327e 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
public class RegisterEntities {
@@ -164,7 +164,7 @@ public class RegisterEntities {
// //////////////////////////////////////
- SpecificationLoaderSpi getSpecificationLoader() {
+ SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 990d075..a28cfd1 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -57,7 +57,7 @@ public class PojoAdapterTest {
@Mock
private Version mockVersion2;
@Mock
- private SpecificationLoaderSpi mockSpecificationLoader;
+ private SpecificationLoader mockSpecificationLoader;
@Mock
private AuthenticationSession mockAuthenticationSession;
@Mock
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 029f042..32bc869 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServiceUtil;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -188,7 +188,7 @@ public abstract class ResourceAbstract {
return IsisContext.getAuthenticationManager();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
index 8e34386..7e3886d 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.model.mementos;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
public final class SpecUtils {
@@ -37,7 +37,7 @@ public final class SpecUtils {
return getSpecificationLoader().loadSpecification(objectSpecId.asString());
}
- protected static SpecificationLoaderSpi getSpecificationLoader() {
+ protected static SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index d47b532..50ad207 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -518,7 +518,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
return IsisContext.getPersistenceSession();
}
- private static SpecificationLoaderSpi getSpecificationLoaderStatic() {
+ private static SpecificationLoader getSpecificationLoaderStatic() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index ec180d2..5818cb7 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -635,7 +635,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
return IsisContext.getOidMarshaller();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index c9429b5..c981222 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.ui.components.bookmarkedpages;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.models.BookmarkTreeNode;
@@ -232,7 +232,7 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 30197af..cd0eff9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
@@ -437,7 +437,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
return IsisContext.getPersistenceSession();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/bytecode-cglib/src/main/java/org/apache/isis/core/bytecode/cglib/ObjectResolveAndObjectChangedEnhancer.java
----------------------------------------------------------------------
diff --git a/mothballed/bytecode-cglib/src/main/java/org/apache/isis/core/bytecode/cglib/ObjectResolveAndObjectChangedEnhancer.java b/mothballed/bytecode-cglib/src/main/java/org/apache/isis/core/bytecode/cglib/ObjectResolveAndObjectChangedEnhancer.java
index a4ee0a6..86814a6 100644
--- a/mothballed/bytecode-cglib/src/main/java/org/apache/isis/core/bytecode/cglib/ObjectResolveAndObjectChangedEnhancer.java
+++ b/mothballed/bytecode-cglib/src/main/java/org/apache/isis/core/bytecode/cglib/ObjectResolveAndObjectChangedEnhancer.java
@@ -31,7 +31,7 @@ import net.sf.cglib.proxy.MethodProxy;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.CglibEnhanced;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
@@ -48,7 +48,7 @@ public class ObjectResolveAndObjectChangedEnhancer extends ObjectResolveAndObjec
*/
private final Map<Class<?>, Enhancer> enhancerByClass = new HashMap<Class<?>, Enhancer>();
- public ObjectResolveAndObjectChangedEnhancer(final ObjectResolver objectResolver, final ObjectChanger objectChanger, final SpecificationLoaderSpi specificationLoader) {
+ public ObjectResolveAndObjectChangedEnhancer(final ObjectResolver objectResolver, final ObjectChanger objectChanger, final SpecificationLoader specificationLoader) {
super(objectResolver, objectChanger, specificationLoader);
createCallback();
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/bytecode-cglib/src/test/java/org/apache/isis/core/bytecode/cglib/ClassEnhancerTest.java
----------------------------------------------------------------------
diff --git a/mothballed/bytecode-cglib/src/test/java/org/apache/isis/core/bytecode/cglib/ClassEnhancerTest.java b/mothballed/bytecode-cglib/src/test/java/org/apache/isis/core/bytecode/cglib/ClassEnhancerTest.java
index 0c541bba..23b98cb 100644
--- a/mothballed/bytecode-cglib/src/test/java/org/apache/isis/core/bytecode/cglib/ClassEnhancerTest.java
+++ b/mothballed/bytecode-cglib/src/test/java/org/apache/isis/core/bytecode/cglib/ClassEnhancerTest.java
@@ -36,7 +36,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;
@@ -48,7 +48,7 @@ public class ClassEnhancerTest {
private ObjectResolveAndObjectChangedEnhancer classEnhancer;
private ObjectResolver mockObjectResolver;
private ObjectChanger mockObjectChanger;
- private SpecificationLoaderSpi mockSpecificationLoader;
+ private SpecificationLoader mockSpecificationLoader;
private SomeDomainObject sdo;
@@ -56,7 +56,7 @@ public class ClassEnhancerTest {
public void setUp() {
mockObjectResolver = mockery.mock(ObjectResolver.class);
mockObjectChanger = mockery.mock(ObjectChanger.class);
- mockSpecificationLoader = mockery.mock(SpecificationLoaderSpi.class);
+ mockSpecificationLoader = mockery.mock(SpecificationLoader.class);
classEnhancer = new ObjectResolveAndObjectChangedEnhancer(mockObjectResolver, mockObjectChanger, mockSpecificationLoader);
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/bytecode-javassist/src/main/java/org/apache/isis/core/bytecode/javassist/ObjectResolveAndObjectChangedEnhancer.java
----------------------------------------------------------------------
diff --git a/mothballed/bytecode-javassist/src/main/java/org/apache/isis/core/bytecode/javassist/ObjectResolveAndObjectChangedEnhancer.java b/mothballed/bytecode-javassist/src/main/java/org/apache/isis/core/bytecode/javassist/ObjectResolveAndObjectChangedEnhancer.java
index b1103b0..fb033a9 100644
--- a/mothballed/bytecode-javassist/src/main/java/org/apache/isis/core/bytecode/javassist/ObjectResolveAndObjectChangedEnhancer.java
+++ b/mothballed/bytecode-javassist/src/main/java/org/apache/isis/core/bytecode/javassist/ObjectResolveAndObjectChangedEnhancer.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
@@ -41,7 +41,7 @@ public class ObjectResolveAndObjectChangedEnhancer extends ObjectResolveAndObjec
private MethodHandler methodHandler;
- public ObjectResolveAndObjectChangedEnhancer(final ObjectResolver objectResolver, final ObjectChanger objectChanger, final SpecificationLoaderSpi specificationLoader) {
+ public ObjectResolveAndObjectChangedEnhancer(final ObjectResolver objectResolver, final ObjectChanger objectChanger, final SpecificationLoader specificationLoader) {
super(objectResolver, objectChanger, specificationLoader);
createCallback();
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
index cf43bff..03ea9d9 100644
--- a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
@@ -241,7 +241,7 @@ public class ObjectReader {
return getPersistenceSession().getAdapterManager();
}
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/keys/KeyCreatorDefault.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/keys/KeyCreatorDefault.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/keys/KeyCreatorDefault.java
index 8605e19..b3fb21e 100644
--- a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/keys/KeyCreatorDefault.java
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/keys/KeyCreatorDefault.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
@@ -87,7 +87,7 @@ public class KeyCreatorDefault {
/////////////////////////////////////////////////
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java b/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
index bad4876..9b2a553 100644
--- a/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
+++ b/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.IdentifierGenerator;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -48,7 +48,7 @@ public class NoSqlIdentifierGeneratorTest {
@Mock
private NoSqlDataDatabase db;
@Mock
- private SpecificationLoaderSpi mockSpecificationLoader;
+ private SpecificationLoader mockSpecificationLoader;
@Mock
private ObjectSpecification mockSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/62bc104c/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java b/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
index dd231c1..410f483 100644
--- a/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
+++ b/mothballed/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
@@ -46,7 +46,7 @@ public class NoSqlKeyCreatorTest {
@Mock
private OidMarshaller mockOidMarshaller;
@Mock
- private SpecificationLoaderSpi mockSpecificationLoader;
+ private SpecificationLoader mockSpecificationLoader;
@Mock
private ObjectSpecification mockSpecification;
@@ -64,7 +64,7 @@ public class NoSqlKeyCreatorTest {
return mockOidMarshaller;
}
@Override
- protected SpecificationLoaderSpi getSpecificationLoader() {
+ protected SpecificationLoader getSpecificationLoader() {
return mockSpecificationLoader;
}
};