You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/05/13 18:32:30 UTC
[isis] branch 2112_SpringBoot updated (849d793 -> d7d939c)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 849d793 ISIS-2112: further fixing meta-model tests (config related)
new 29e7951 ISIS-2112: cleaning up the IsisConfiguration Interface
new d7d939c ISIS-2112: fixes 'config', also further fixes 'meta-model' tests
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/config/ConfigurationConstants.java | 16 ++++-
.../org/apache/isis/config/IsisConfiguration.java | 74 ++++------------------
.../isis/config/internal/_Config_Instance.java | 20 +++---
.../config/internal/_Config_LifecycleResource.java | 4 +-
.../ViewModelSemanticCheckingFacetFactory.java | 7 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 47 +++++++-------
.../ViewModelSemanticCheckingFacetFactoryTest.java | 3 +-
.../TitleFacetViaTitleAnnotationTest.java | 16 ++++-
8 files changed, 80 insertions(+), 107 deletions(-)
[isis] 02/02: ISIS-2112: fixes 'config',
also further fixes 'meta-model' tests
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d7d939cef95fae618c150353b00cec7480c73c35
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 13 20:32:23 2019 +0200
ISIS-2112: fixes 'config', also further fixes 'meta-model' tests
- failing count is down to 2
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../apache/isis/config/ConfigurationConstants.java | 13 +++++++++++--
.../isis/config/internal/_Config_Instance.java | 20 ++++++++++----------
.../config/internal/_Config_LifecycleResource.java | 4 +---
.../ViewModelSemanticCheckingFacetFactory.java | 7 +++++--
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 3 ++-
.../annotation/TitleFacetViaTitleAnnotationTest.java | 16 +++++++++++++---
7 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index d8f48c2..6c13a88 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -40,8 +40,17 @@ public final class ConfigurationConstants {
public static final String WEB_CONFIG_FILE = "web.properties";
public static final class Keys {
- public static final String EXPLICIT_ANNOTATIONS_FOR_ACTIONS =
- ROOT + "reflector.explicitAnnotations.action";
+
+ public static final class Reflector {
+
+ public static final String explicitAnnotationsForActions =
+ ROOT + "reflector.explicitAnnotations.action";
+
+ public static final String viewModelSemanticCheckingFacetFactoryEnable =
+ ROOT + "reflector.facets.ViewModelSemanticCheckingFacetFactory.enable";
+
+ }
+
}
public static final List<String> PROTECTED_KEYS =
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
index 2f25371..fdb10e0 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
@@ -47,52 +47,52 @@ final class _Config_Instance implements IsisConfiguration {
@Override
public boolean getBoolean(String name) {
- return computeIfAbsent(booleanParser.apply(name), ()->false);
+ return computeIfAbsent(booleanParser.apply(getString(name)), ()->false);
}
@Override
public boolean getBoolean(String name, boolean defaultValue) {
- return computeIfAbsent(booleanParser.apply(name), ()->defaultValue);
+ return computeIfAbsent(booleanParser.apply(getString(name)), ()->defaultValue);
}
@Override
public Color getColor(String name) {
- return colorParser.apply(name);
+ return colorParser.apply(getString(name));
}
@Override
public Color getColor(String name, Color defaultValue) {
- return computeIfAbsent(colorParser.apply(name), ()->defaultValue);
+ return computeIfAbsent(colorParser.apply(getString(name)), ()->defaultValue);
}
@Override
public Font getFont(String name) {
- return fontParser.apply(name);
+ return fontParser.apply(getString(name));
}
@Override
public Font getFont(String name, Font defaultValue) {
- return computeIfAbsent(fontParser.apply(name), ()->defaultValue);
+ return computeIfAbsent(fontParser.apply(getString(name)), ()->defaultValue);
}
@Override
public String[] getList(String name) {
- return computeIfAbsent(listParser.apply(name), ()->_Constants.emptyStringArray);
+ return computeIfAbsent(listParser.apply(getString(name)), ()->_Constants.emptyStringArray);
}
@Override
public String[] getList(String name, String defaultListAsCommaSeparatedArray) {
- return computeIfAbsent(listParser.apply(name), ()->listParser.apply(defaultListAsCommaSeparatedArray));
+ return computeIfAbsent(listParser.apply(getString(name)), ()->listParser.apply(defaultListAsCommaSeparatedArray));
}
@Override
public int getInteger(String name) {
- return computeIfAbsent(integerParser.apply(name), ()->0);
+ return computeIfAbsent(integerParser.apply(getString(name)), ()->0);
}
@Override
public int getInteger(String name, int defaultValue) {
- return computeIfAbsent(integerParser.apply(name), ()->defaultValue);
+ return computeIfAbsent(integerParser.apply(getString(name)), ()->defaultValue);
}
@Override
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
index 3ff6534..11162db 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Optional;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
import static org.apache.isis.commons.internal.base._With.requires;
@@ -77,8 +76,7 @@ class _Config_LifecycleResource {
_Config_Parsers::parseFont,
_Config_Parsers::parseList);
- log.info("=== BUILT/DONE ===");
- _Exceptions.dumpStackTrace(System.err, 0, 40);
+ log.info("=== Config Finalized ===");
return config;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
index 932f830..8aa8a13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
@@ -25,6 +25,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.applib.annotation.ViewModelLayout;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -46,8 +47,10 @@ public class ViewModelSemanticCheckingFacetFactory extends FacetFactoryAbstract
public void process(final ProcessClassContext processClassContext) {
// disable by default
- final boolean enable = getConfiguration().getBoolean(
- "isis.reflector.facets.ViewModelSemanticCheckingFacetFactory.enable", false);
+ final boolean enable = getConfiguration()
+ .getBoolean(
+ ConfigurationConstants.Keys.Reflector.viewModelSemanticCheckingFacetFactoryEnable,
+ false);
if(!enable) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index ca1ced6..d509ebd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -160,7 +160,7 @@ public class FacetedMethodsBuilder {
this.specificationLoader = facetedMethodsBuilderContext.specificationLoader;
this.explicitAnnotationsForActions = _Config.getConfiguration()
- .getBoolean(ConfigurationConstants.Keys.EXPLICIT_ANNOTATIONS_FOR_ACTIONS);
+ .getBoolean(ConfigurationConstants.Keys.Reflector.explicitAnnotationsForActions);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 6902243..16e883a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -63,7 +64,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
_Context.clear();
_Config.clear();
- _Config.put("isis.reflector.facets.ViewModelSemanticCheckingFacetFactory.enable", true);
+ _Config.put(ConfigurationConstants.Keys.Reflector.viewModelSemanticCheckingFacetFactoryEnable, true);
facetFactory = new ViewModelSemanticCheckingFacetFactory();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index b1b44ae..9cca81b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -19,19 +19,18 @@
package org.apache.isis.core.metamodel.facets.object.ident.title.annotation;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.List;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.auto.Mock;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -42,6 +41,9 @@ import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetV
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class TitleFacetViaTitleAnnotationTest {
@Rule
@@ -84,6 +86,14 @@ public class TitleFacetViaTitleAnnotationTest {
}
+ @Before
+ public void setUp() {
+ MetaModelContext.preset(MetaModelContext.builder()
+ .objectAdapterProvider(mockAdapterManager)
+ .build());
+ }
+
+
@Test
public void testTitle() throws Exception {
final List<Annotations.Evaluator<Title>> evaluatorList = Annotations
[isis] 01/02: ISIS-2112: cleaning up the IsisConfiguration Interface
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 29e79519a1767d05f006ebc78bc646803ae41a1f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 13 19:04:55 2019 +0200
ISIS-2112: cleaning up the IsisConfiguration Interface
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../apache/isis/config/ConfigurationConstants.java | 7 +-
.../org/apache/isis/config/IsisConfiguration.java | 74 ++++------------------
.../specloader/specimpl/FacetedMethodsBuilder.java | 47 +++++++-------
3 files changed, 40 insertions(+), 88 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index 7acb3aa..d8f48c2 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -35,10 +35,15 @@ public final class ConfigurationConstants {
public static final String DEFAULT_CONFIG_DIRECTORY = "config";
public static final String WEBINF_DIRECTORY = "WEB-INF";
public static final String WEBINF_FULL_DIRECTORY = "src/main/webapp/" + WEBINF_DIRECTORY;
-
+
public static final String DEFAULT_CONFIG_FILE = "isis.properties";
public static final String WEB_CONFIG_FILE = "web.properties";
+ public static final class Keys {
+ public static final String EXPLICIT_ANNOTATIONS_FOR_ACTIONS =
+ ROOT + "reflector.explicitAnnotations.action";
+ }
+
public static final List<String> PROTECTED_KEYS =
_Lists.of("password", "apiKey", "authToken");
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 7903692..9917ef0 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -28,7 +28,8 @@ import java.util.Map;
* system.
*/
public interface IsisConfiguration {
-
+
+//TODO[2112] remove comment
// /**
// * How to handle the case when the configuration already contains the key being added.
// */
@@ -46,36 +47,7 @@ public interface IsisConfiguration {
// */
// EXCEPTION
// }
-
- // -- BUILDERS
-
-// /**
-// *
-// * @param topModule
-// * @param additionalPropertyResources
-// * @return
-// * @since 2.0.0-M2
-// */
-// static IsisConfiguration buildFromModuleTree(Module topModule, PropertyResource ... additionalPropertyResources) {
-// clear();
-// acceptBuilder(builder->{
-// stream(additionalPropertyResources)
-// .forEach(builder::addPropertyResource);
-// builder.addTopModule(topModule);
-// });
-// return getConfiguration();
-// }
-
-// /**
-// * @since 2.0.0-M2
-// */
-// static IsisConfiguration buildFromAppManifest(AppManifest appManifest) {
-// clear();
-// acceptBuilder(builder->{
-// builder.addAppManifest(appManifest);
-// });
-// return getConfiguration();
-// }
+
// -- VERSION
@@ -85,11 +57,11 @@ public interface IsisConfiguration {
// --
-// /**
-// * @since 2.0.0-M2
-// */
-// public AppManifest getAppManifest();
-
+ /**
+ * Creates a copy of this instance, that is a new IsisConfiguration populated
+ * with a copy of the underlying key/value pairs.
+ *
+ */
IsisConfiguration copy();
/**
@@ -222,35 +194,11 @@ public interface IsisConfiguration {
boolean isEmpty();
-// /**
-// * Iterates over the property names of this configuration.
-// */
-// Iterator<String> iterator();
-//
-// Iterable<String> asIterable();
-//
-// int size();
-//
-// /**
-// * The {@link ResourceStreamSource} that was used to build this
-// * configuration.
-// */
-// ResourceStreamSource getResourceStreamSource();
-// /**
-// * A mutable copy of the current set of properties (name/values) held in this configuration.
-// */
-// Map<String, String> asMap();
-
+ /**
+ * A mutable copy of the current set of properties (name/values) held in this configuration.
+ */
Map<String, String> copyToMap();
-
- // -- SHORTCUTS
-
- default boolean explicitAnnotationsForActions() {
- return getBoolean("isis.reflector.explicitAnnotations.action");
- }
-
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 994d778..ca1ced6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ListExtensions;
@@ -50,25 +51,21 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import lombok.val;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class FacetedMethodsBuilder {
- private static final Logger LOG = LoggerFactory.getLogger(FacetedMethodsBuilder.class);
-
private static final String GET_PREFIX = "get";
private static final String IS_PREFIX = "is";
private static final class FacetedMethodsMethodRemover implements MethodRemover {
- private final Class<?> introspectedClass;
private final List<Method> methods;
private FacetedMethodsMethodRemover(final Class<?> introspectedClass, final List<Method> methods) {
- this.introspectedClass = introspectedClass;
this.methods = methods;
}
@@ -149,8 +146,8 @@ public class FacetedMethodsBuilder {
public FacetedMethodsBuilder(
final ObjectSpecificationAbstract spec,
final FacetedMethodsBuilderContext facetedMethodsBuilderContext) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("creating JavaIntrospector for {}", spec.getFullIdentifier());
+ if (log.isDebugEnabled()) {
+ log.debug("creating JavaIntrospector for {}", spec.getFullIdentifier());
}
this.spec = spec;
@@ -162,7 +159,9 @@ public class FacetedMethodsBuilder {
this.facetProcessor = facetedMethodsBuilderContext.facetProcessor;
this.specificationLoader = facetedMethodsBuilderContext.specificationLoader;
- this.explicitAnnotationsForActions = _Config.getConfiguration().explicitAnnotationsForActions();
+ this.explicitAnnotationsForActions = _Config.getConfiguration()
+ .getBoolean(ConfigurationConstants.Keys.EXPLICIT_ANNOTATIONS_FOR_ACTIONS);
+
}
// ////////////////////////////////////////////////////////////////////////////
@@ -179,14 +178,14 @@ public class FacetedMethodsBuilder {
public void introspectObjectSpecId() {
- if (LOG.isInfoEnabled()) {
- LOG.info("introspecting {}: objectSpecId", getClassName());
+ if (log.isInfoEnabled()) {
+ log.info("introspecting {}: objectSpecId", getClassName());
}
getFacetProcessor().processObjectSpecId(introspectedClass, spec);
}
public void introspectClass() {
- if (LOG.isInfoEnabled()) {
- LOG.info("introspecting {}: class-level details", getClassName());
+ if (log.isInfoEnabled()) {
+ log.info("introspecting {}: class-level details", getClassName());
}
// process facets at object level
@@ -229,8 +228,8 @@ public class FacetedMethodsBuilder {
}
private List<FacetedMethod> createAssociationFacetedMethods() {
- if (LOG.isDebugEnabled()) {
- LOG.debug("introspecting {}: properties and collections", getClassName());
+ if (log.isDebugEnabled()) {
+ log.debug("introspecting {}: properties and collections", getClassName());
}
final Set<Method> associationCandidateMethods = getFacetProcessor().findAssociationCandidateAccessors(methods, new HashSet<Method>());
@@ -278,8 +277,8 @@ public class FacetedMethodsBuilder {
final List<Method> accessorMethods,
final List<FacetedMethod> facetMethodsToAppendto) {
for (final Method accessorMethod : accessorMethods) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(" identified accessor method representing collection: {}", accessorMethod);
+ if (log.isDebugEnabled()) {
+ log.debug(" identified accessor method representing collection: {}", accessorMethod);
}
// create property and add facets
@@ -308,7 +307,7 @@ public class FacetedMethodsBuilder {
final List<FacetedMethod> facetedMethodsToAppendto) throws MetaModelException {
for (final Method accessorMethod : accessorMethods) {
- LOG.debug(" identified accessor method representing property: {}", accessorMethod);
+ log.debug(" identified accessor method representing property: {}", accessorMethod);
final Class<?> returnType = accessorMethod.getReturnType();
@@ -357,8 +356,8 @@ public class FacetedMethodsBuilder {
*/
private List<FacetedMethod> findActionFacetedMethods(
final MethodScope methodScope) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("introspecting {}: actions", getClassName());
+ if (log.isDebugEnabled()) {
+ log.debug("introspecting {}: actions", getClassName());
}
final List<FacetedMethod> actionFacetedMethods1 = findActionFacetedMethods(methodScope, RecognisedHelpersStrategy.SKIP);
final List<FacetedMethod> actionFacetedMethods2 = findActionFacetedMethods(methodScope, RecognisedHelpersStrategy.DONT_SKIP);
@@ -369,8 +368,8 @@ public class FacetedMethodsBuilder {
final MethodScope methodScope,
final RecognisedHelpersStrategy recognisedHelpersStrategy) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(" looking for action methods");
+ if (log.isDebugEnabled()) {
+ log.debug(" looking for action methods");
}
final List<FacetedMethod> actionFacetedMethods = _Lists.newArrayList();
@@ -466,7 +465,7 @@ public class FacetedMethodsBuilder {
return false;
}
if (recognisedHelpersStrategy.skip()) {
- LOG.debug(" skipping possible helper method {0}", actionMethod);
+ log.debug(" skipping possible helper method {0}", actionMethod);
return false;
}
}
@@ -476,7 +475,7 @@ public class FacetedMethodsBuilder {
return false;
}
}
- LOG.debug(" identified action {0}", actionMethod);
+ log.debug(" identified action {0}", actionMethod);
return true;
}