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 2018/02/13 16:53:36 UTC
[isis] branch maint-1.16.1 updated (6ed8ec4 -> b892b97)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 6ed8ec4 ISIS-1759: avoids calls to getter if property is hidden.
new 6eb767f ISIS-1829: adds condition for a builder that inherits from AppManifestAbstract2.Builder
new b892b97 ISIS-1829: extracts methods to make flow easier to follow
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/isis/applib/AppManifestAbstract.java | 33 ++++++++++++++--------
1 file changed, 22 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/02: ISIS-1829: extracts methods to make flow easier to
follow
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b892b97f026a0f83c984b8a1fce8e8a434ea3ecd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 16:50:14 2018 +0000
ISIS-1829: extracts methods to make flow easier to follow
---
.../apache/isis/applib/AppManifestAbstract.java | 37 +++++++++++++---------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
index f74223a..6649cbd 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
@@ -64,29 +64,36 @@ public abstract class AppManifestAbstract implements AppManifest {
if (overriddenAuthMechanism != null) {
return overriddenAuthMechanism;
} else {
- if(builder instanceof AppManifestAbstract.Builder) {
- return ((AppManifestAbstract.Builder) builder).authMechanism;
- } else if(builder instanceof AppManifestAbstract2.Builder) {
- return ((AppManifestAbstract2.Builder) builder).authMechanism;
- } else {
- return null;
- }
+ return obtainAuthMechanismFrom(builder);
}
}
private List<Class<? extends FixtureScript>> determineFixtures(final ModuleOrBuilderAbstract<?> builder) {
- final List<Class<? extends FixtureScript>> builderFixtures;
- if(builder instanceof AppManifestAbstract.Builder) {
- builderFixtures = ((AppManifestAbstract.Builder) builder).fixtures;
- } else if(builder instanceof AppManifestAbstract2.Builder) {
- builderFixtures = ((AppManifestAbstract2.Builder) builder).fixtures;
- } else {
- builderFixtures = Lists.newArrayList();
- }
+ final List<Class<? extends FixtureScript>> builderFixtures = obtainBuilderFixturesFrom(builder);
overrideFixtures(builderFixtures);
return builderFixtures;
}
+ private static String obtainAuthMechanismFrom(final ModuleOrBuilderAbstract<?> builder) {
+ if(builder instanceof Builder) {
+ return ((Builder) builder).authMechanism;
+ }
+ if(builder instanceof AppManifestAbstract2.Builder) {
+ return ((AppManifestAbstract2.Builder) builder).authMechanism;
+ }
+ return null;
+ }
+
+ private static List<Class<? extends FixtureScript>> obtainBuilderFixturesFrom(final ModuleOrBuilderAbstract<?> builder) {
+ if(builder instanceof Builder) {
+ return ((Builder) builder).fixtures;
+ }
+ if(builder instanceof AppManifestAbstract2.Builder) {
+ return ((AppManifestAbstract2.Builder) builder).fixtures;
+ }
+ return Lists.newArrayList();
+ }
+
private Map<String, String> createConfigurationProperties(
final List<PropertyResource> propertyResources,
final Map<String,String> individualConfigProps,
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/02: ISIS-1829: adds condition for a builder that inherits
from AppManifestAbstract2.Builder
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6eb767fd80500f9ef6157009d3022d81420b86bd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 16:47:30 2018 +0000
ISIS-1829: adds condition for a builder that inherits from AppManifestAbstract2.Builder
---
.../java/org/apache/isis/applib/AppManifestAbstract.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
index 905f8ef..f74223a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
@@ -64,8 +64,10 @@ public abstract class AppManifestAbstract implements AppManifest {
if (overriddenAuthMechanism != null) {
return overriddenAuthMechanism;
} else {
- if(builder instanceof Builder) {
- return ((Builder) builder).authMechanism;
+ if(builder instanceof AppManifestAbstract.Builder) {
+ return ((AppManifestAbstract.Builder) builder).authMechanism;
+ } else if(builder instanceof AppManifestAbstract2.Builder) {
+ return ((AppManifestAbstract2.Builder) builder).authMechanism;
} else {
return null;
}
@@ -74,8 +76,10 @@ public abstract class AppManifestAbstract implements AppManifest {
private List<Class<? extends FixtureScript>> determineFixtures(final ModuleOrBuilderAbstract<?> builder) {
final List<Class<? extends FixtureScript>> builderFixtures;
- if(builder instanceof Builder) {
- builderFixtures = ((Builder) builder).fixtures;
+ if(builder instanceof AppManifestAbstract.Builder) {
+ builderFixtures = ((AppManifestAbstract.Builder) builder).fixtures;
+ } else if(builder instanceof AppManifestAbstract2.Builder) {
+ builderFixtures = ((AppManifestAbstract2.Builder) builder).fixtures;
} else {
builderFixtures = Lists.newArrayList();
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.