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/06/16 09:44:46 UTC
[05/13] isis git commit: ISIS-1291: adds @Programmatic where
necessary for new and internal domain services
ISIS-1291: adds @Programmatic where necessary for new and internal domain services
... so that this stuff isn't unnecessarily loaded into themetamodel.
In a similar vein, aAlso change IsisConfiguration so that it doesn't implement Iterable, because otherwise the default interface methods (spliterator, forEach) show up in the metamodel. Instead, extend to provide an "asIterable()" method.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e2e206c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e2e206c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e2e206c3
Branch: refs/heads/ISIS-1427
Commit: e2e206c3e5e4e21a9c19864bef7417aacfe58945
Parents: 51143d1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 16:37:29 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 16:40:11 2016 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 6 ++--
.../isis/applib/services/iactn/Interaction.java | 29 ++++++++++++++++++--
.../core/commons/config/IsisConfiguration.java | 29 +++++++++++++++++---
.../config/IsisConfigurationDefault.java | 18 ++++++++----
.../metamodel/facetapi/MetaModelRefiner.java | 4 ++-
.../ConfigurationServiceInternal.java | 3 ++
.../PersistenceSessionServiceInternal.java | 4 +--
.../persistence/PersistenceSessionFactory.java | 1 +
.../system/session/IsisSessionFactory.java | 1 +
.../scenarios/RecreateSimpleObjects.java | 2 ++
10 files changed, 80 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 08a1d3f..b905ebc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -176,7 +176,7 @@ public abstract class FixtureScript
* Will always be populated, initially by the default name, but can be
* {@link #setLocalName(String) overridden}.
*/
- @PropertyLayout(hidden = Where.EVERYWHERE)
+ @Programmatic
public String getLocalName() {
return localName;
}
@@ -235,7 +235,7 @@ public abstract class FixtureScript
* {@link FixtureScript}s are {@link Discoverability#NON_DISCOVERABLE not}. This can be overridden in the
* constructor, however or by calling the {@link #withDiscoverability(org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability) setter}.
*/
- @PropertyLayout(hidden = Where.EVERYWHERE)
+ @Programmatic
public boolean isDiscoverable() {
return discoverability == Discoverability.DISCOVERABLE;
}
@@ -784,6 +784,7 @@ public abstract class FixtureScript
/**
* Use instead {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#lookup(String, Class)} directly.
*/
+ @Programmatic
@Deprecated
public <T> T lookup(final String key, final Class<T> cls) {
if(executionContext == null) {
@@ -866,6 +867,7 @@ public abstract class FixtureScript
//region > (legacy) InstallableFixture impl
@Override
+ @Programmatic
public FixtureType getType() {
return FixtureType.DOMAIN_OBJECTS;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 92ca09c..25a1e45 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -27,8 +27,6 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -85,11 +83,13 @@ public class Interaction implements HasTransactionId {
private UUID transactionId;
+ @Programmatic
@Override
public UUID getTransactionId() {
return transactionId;
}
+ @Programmatic
@Override
public void setTransactionId(final UUID transactionId) {
this.transactionId = transactionId;
@@ -106,6 +106,7 @@ public class Interaction implements HasTransactionId {
/**
* The execution that preceded the current one.
*/
+ @Programmatic
public Execution getPriorExecution() {
return priorExecution;
}
@@ -118,6 +119,7 @@ public class Interaction implements HasTransactionId {
* by which the framework actually performs the interaction.
*/
public interface MemberExecutor<T extends Execution> {
+ @Programmatic
Object execute(final T currentExecution);
}
@@ -129,6 +131,7 @@ public class Interaction implements HasTransactionId {
* {@link ActionInvocation} capturing the details of said action.
* </p>
*/
+ @Programmatic
public Object execute(
final MemberExecutor<ActionInvocation> memberExecutor,
final ActionInvocation actionInvocation) {
@@ -146,6 +149,7 @@ public class Interaction implements HasTransactionId {
* {@link PropertyEdit} capturing the details of said property edit.
* </p>
*/
+ @Programmatic
public Object execute(
final MemberExecutor<PropertyEdit> memberExecutor,
final PropertyEdit propertyEdit) {
@@ -355,14 +359,17 @@ public class Interaction implements HasTransactionId {
//region > via constructor: interaction, interactionType, memberId, target, targetMember, targetClass
+ @Programmatic
public Interaction getInteraction() {
return interaction;
}
+ @Programmatic
public InteractionType getInteractionType() {
return interactionType;
}
+ @Programmatic
public String getMemberIdentifier() {
return memberIdentifier;
}
@@ -371,6 +378,7 @@ public class Interaction implements HasTransactionId {
* The target of the action invocation. If this interaction is for a mixin action, then will be the
* mixed-in target (not the transient mixin itself).
*/
+ @Programmatic
public Object getTarget() {
return target;
}
@@ -378,6 +386,7 @@ public class Interaction implements HasTransactionId {
/**
* A human-friendly description of the class of the target object.
*/
+ @Programmatic
public String getTargetClass() {
return targetClass;
}
@@ -385,6 +394,7 @@ public class Interaction implements HasTransactionId {
/**
* The human-friendly name of the action invoked/property edited on the target object.
*/
+ @Programmatic
public String getTargetMember() {
return targetMember;
}
@@ -399,6 +409,7 @@ public class Interaction implements HasTransactionId {
/**
* The action/property that invoked this action/property edit (if any).
*/
+ @Programmatic
public Execution<?,?> getParent() {
return parent;
}
@@ -406,6 +417,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setParent(final Execution<?,?> parent) {
this.parent = parent;
if(parent != null) {
@@ -416,6 +428,7 @@ public class Interaction implements HasTransactionId {
/**
* The actions/property edits made in turn via the {@link WrapperFactory}.
*/
+ @Programmatic
public List<Execution<?,?>> getChildren() {
return Collections.unmodifiableList(children);
}
@@ -435,6 +448,7 @@ public class Interaction implements HasTransactionId {
* {@link AbstractDomainEvent.Phase#EXECUTING executing} phase.
* </p>
*/
+ @Programmatic
public E getEvent() {
return event;
}
@@ -442,6 +456,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setEvent(final E event) {
this.event = event;
}
@@ -455,10 +470,12 @@ public class Interaction implements HasTransactionId {
/**
* The date/time at which this execution started.
*/
+ @Programmatic
public Timestamp getStartedAt() {
return startedAt;
}
+ @Programmatic
public void setStartedAt(final Timestamp startedAt) {
syncMetrics(When.BEFORE, startedAt);
}
@@ -467,6 +484,7 @@ public class Interaction implements HasTransactionId {
/**
* The date/time at which this execution completed.
*/
+ @Programmatic
public Timestamp getCompletedAt() {
return completedAt;
}
@@ -494,6 +512,7 @@ public class Interaction implements HasTransactionId {
* For <tt>void</tt> methods and for actions returning collections, the value
* will be <tt>null</tt>.
*/
+ @Programmatic
public Object getReturned() {
return returned;
}
@@ -501,6 +520,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setReturned(Object returned) {
this.returned = returned;
}
@@ -514,6 +534,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setThrew(Exception threw) {
this.threw = threw;
}
@@ -534,6 +555,7 @@ public class Interaction implements HasTransactionId {
* {@link Execution#getReturned()}) will (obviously) still be null.
* </p>
*/
+ @Programmatic
public T getDto() {
return dto;
}
@@ -541,6 +563,7 @@ public class Interaction implements HasTransactionId {
/**
* Set by framework (implementation of {@link MemberExecutor})
*/
+ @Programmatic
public void setDto(final T executionDto) {
this.dto = executionDto;
}
@@ -649,6 +672,7 @@ public class Interaction implements HasTransactionId {
this.args = args;
}
+ @Programmatic
public List<Object> getArgs() {
return args;
}
@@ -669,6 +693,7 @@ public class Interaction implements HasTransactionId {
this.newValue = newValue;
}
+ @Programmatic
public Object getNewValue() {
return newValue;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
index 12a0c11..9530a66 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
@@ -24,6 +24,7 @@ import java.awt.Font;
import java.util.Iterator;
import java.util.Map;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
@@ -42,7 +43,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSource;
* Thus the {@link IsisConfiguration} held by different components may vary, but
* with each being a possible superset of the previous.
*/
-public interface IsisConfiguration extends Iterable<String>, ApplicationScopedComponent {
+public interface IsisConfiguration extends ApplicationScopedComponent {
/**
* Creates a new IsisConfiguration containing the properties starting with
@@ -52,6 +53,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
*
* @see #getProperties(String)
*/
+ @Programmatic
IsisConfiguration createSubset(String prefix);
/**
@@ -62,6 +64,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
boolean getBoolean(String name);
/**
@@ -74,6 +77,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
boolean getBoolean(String name, boolean defaultValue);
/**
@@ -83,6 +87,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
Color getColor(String name);
/**
@@ -94,6 +99,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
Color getColor(String name, Color defaultValue);
/**
@@ -103,6 +109,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
Font getFont(String name);
/**
@@ -114,6 +121,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the color to use as a default
*/
+ @Programmatic
Font getFont(String name, Font defaultValue);
/**
@@ -123,12 +131,14 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* <p>
* If there is no matching property then returns an empty array.
*/
+ @Programmatic
String[] getList(String name);
/**
* Returns a list of entries for the single configuration property with the
* specified name.
*/
+ @Programmatic
String[] getList(String name, String defaultListAsCommaSeparatedArray);
/**
@@ -138,6 +148,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
int getInteger(String name);
/**
@@ -149,6 +160,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
int getInteger(String name, int defaultValue);
/**
@@ -160,39 +172,48 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
*
* @see #createSubset(String)
*/
+ @Programmatic
IsisConfiguration getProperties(String withPrefix);
/**
* Returns the configuration property with the specified name. If there is
* no matching property then null is returned.
*/
+ @Programmatic
String getString(String name);
+ @Programmatic
String getString(String name, String defaultValue);
+ @Programmatic
boolean hasProperty(String name);
+ @Programmatic
boolean isEmpty();
/**
* Iterates over the property names of this configuration.
*/
- @Override
+ @Programmatic
Iterator<String> iterator();
+ @Programmatic
+ Iterable<String> asIterable();
+
+ @Programmatic
int size();
/**
* The {@link ResourceStreamSource} that was used to build this
* configuration.
- *
- * @see IsisConfigurationBuilder#getResourceStreamSource()
*/
+ @Programmatic
ResourceStreamSource getResourceStreamSource();
/**
* A mutable copy of the current set of properties (name/values) held in this configuration.
*/
+ @Programmatic
Map<String, String> asMap();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index d671c76..011c37d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -34,10 +34,11 @@ import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
/**
* This object will typically be registered as the implementation of the {@link ConfigurationServiceInternal}
@@ -111,6 +112,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
/**
* Add the properties from an existing Properties object.
*/
+ @Programmatic
public void add(final Properties properties, final ContainsPolicy containsPolicy) {
for(Object key: properties.keySet()) {
Object value = properties.get(key);
@@ -125,6 +127,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
* @see #addPerPolicy(String, String, ContainsPolicy)
* @see #put(String, String)
*/
+ @Programmatic
public void add(final String key, final String value) {
addPerPolicy(key, value, ContainsPolicy.IGNORE);
}
@@ -136,6 +139,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
* @see #add(String, String)
* @see #addPerPolicy(String, String, ContainsPolicy)
*/
+ @Programmatic
public void put(final String key, final String value) {
addPerPolicy(key, value, ContainsPolicy.OVERWRITE);
}
@@ -419,7 +423,12 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
@Override
public Iterator<String> iterator() {
- return properties.stringPropertyNames().iterator();
+ return asIterable().iterator();
+ }
+
+ @Override
+ public Iterable<String> asIterable() {
+ return properties.stringPropertyNames();
}
/**
@@ -448,7 +457,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
@Override
public Map<String,String> asMap() {
final Map<String, String> map = Maps.newHashMap();
- for(String propertyName: this) {
+ for(String propertyName: this.asIterable()) {
final String propertyValue = this.getPropertyElseNull(propertyName);
map.put(propertyName, propertyValue);
}
@@ -472,7 +481,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
private Properties deriveApplicationProperties() {
final Properties applicationProperties = new Properties();
final IsisConfiguration applicationConfiguration = getProperties("application");
- for (final String key : applicationConfiguration) {
+ for (final String key : applicationConfiguration.asIterable()) {
final String value = applicationConfiguration.getString(key);
final String newKey = key.substring("application.".length());
applicationProperties.setProperty(newKey, value);
@@ -492,5 +501,4 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
}
//endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
index 541795f..7e9320b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.metamodel.facetapi;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -31,7 +32,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
* @see MetaModelValidatorRefiner
*/
public interface MetaModelRefiner extends MetaModelValidatorRefiner {
-
+
+ @Programmatic
void refineProgrammingModel(ProgrammingModel programmingModel, IsisConfiguration configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
index cbb8be4..499c07e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
@@ -18,12 +18,15 @@ package org.apache.isis.core.metamodel.services.configinternal;
import java.util.List;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.config.IsisConfiguration;
public interface ConfigurationServiceInternal extends IsisConfiguration {
+ @Programmatic
String getProperty(String name);
+ @Programmatic
List<String> getPropertyNames();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
index 87c289a..d1e5853 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
@@ -109,6 +109,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
@Programmatic
void commit();
+ @Programmatic
Transaction currentTransaction();
//endregion
@@ -160,7 +161,4 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
-
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/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 8d45740..d5e1118 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
@@ -157,6 +157,7 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
//endregion
//region > shutdown
+ @Programmatic
public final void shutdown() {
// no-op
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/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 b81ec1d..80bc088 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
@@ -228,6 +228,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* {@link DeploymentType#SERVER_PROTOTYPE prototype} deployments (saves logging
* in). Should be <i>ignored</i> in other {@link DeploymentType}s.
*/
+ @Programmatic
public LogonFixture getLogonFixture() {
return logonFixture;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index 55b9045..944ace7 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -25,6 +25,7 @@ import java.util.List;
import com.google.common.collect.Lists;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import domainapp.dom.simple.SimpleObject;
@@ -62,6 +63,7 @@ public class RecreateSimpleObjects extends FixtureScript {
/**
* The simpleobjects created by this fixture (output).
*/
+ @Programmatic
public List<SimpleObject> getSimpleObjects() {
return simpleObjects;
}