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 2013/06/22 16:44:56 UTC
[2/2] git commit: ISIS-444: @MinLength for autocomplete methods,
and no min length for choices.
ISIS-444: @MinLength for autocomplete methods, and no min length for choices.
* also tiny performance improvement in ServicesInjectorDefault (no jira ticket raised).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/050e9e32
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/050e9e32
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/050e9e32
Branch: refs/heads/master
Commit: 050e9e32f2cbc7ccce972675bfe988a38ebdaba2
Parents: fc4ff2f
Author: Dan Haywood <da...@apache.org>
Authored: Sat Jun 22 15:44:32 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Jun 22 15:44:32 2013 +0100
----------------------------------------------------------------------
.../viewer/wicket/model/models/ScalarModel.java | 38 +++++++++++++++-
.../entitylink/EntityLinkSelect2Panel.java | 8 ++--
.../isis/applib/annotation/MinLength.java | 36 +++++++++++++++
.../ActionParameterAutoCompleteFacet.java | 4 ++
.../autocomplete/PropertyAutoCompleteFacet.java | 4 ++
.../services/ServicesInjectorDefault.java | 20 +++++---
.../spec/feature/ObjectActionParameter.java | 5 +-
.../spec/feature/ObjectAssociation.java | 2 +
.../spec/feature/OneToOneAssociation.java | 1 +
.../specimpl/ObjectActionParameterAbstract.java | 8 +++-
.../specimpl/OneToManyAssociationImpl.java | 5 ++
.../specimpl/OneToOneAssociationImpl.java | 8 ++++
...ctionParameterAutoCompleteFacetAbstract.java | 3 ++
...tionParameterAutoCompleteFacetViaMethod.java | 8 ++++
.../param/autocomplete/MinLengthUtil.java | 48 ++++++++++++++++++++
.../PropertyAutoCompleteFacetAbstract.java | 4 +-
.../PropertyAutoCompleteFacetViaMethod.java | 8 ++++
.../specimpl/ObjectAssociationAbstractTest.java | 6 ++-
...ectAssociationAbstractTest_alwaysHidden.java | 4 ++
.../dom/src/main/java/dom/todo/ToDoItem.java | 4 +-
20 files changed, 206 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 04ec017..aad39bc 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionParameterAbstract;
import org.apache.isis.core.progmodel.facets.value.bigdecimal.BigDecimalValueFacet;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -181,6 +182,19 @@ public class ScalarModel extends EntityModel implements LinksProvider {
}
@Override
+ public int getAutoCompleteOrChoicesMinLength(ScalarModel scalarModel) {
+
+ if (scalarModel.hasAutoComplete()) {
+ final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
+ final OneToOneAssociation property = propertyMemento.getProperty();
+ return property.getAutoCompleteMinLength();
+ } else {
+ return 0;
+ }
+ }
+
+
+ @Override
public void resetVersion(ScalarModel scalarModel) {
scalarModel.parentObjectAdapterMemento.resetVersion();
}
@@ -207,6 +221,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final BigDecimalValueFacet facet = property.getFacet(BigDecimalValueFacet.class);
return facet != null? facet.getScale(): null;
}
+
},
PARAMETER {
@Override
@@ -305,7 +320,18 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final ObjectAdapter[] choices = actionParameter.getAutoComplete(scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK), searchArg);
return choicesAsList(choices);
}
-
+
+ @Override
+ public int getAutoCompleteOrChoicesMinLength(ScalarModel scalarModel) {
+ if (scalarModel.hasAutoComplete()) {
+ final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ return actionParameter.getAutoCompleteMinLength();
+ } else {
+ return 0;
+ }
+ }
+
@Override
public void resetVersion(ScalarModel scalarModel) {
// no-op?
@@ -370,6 +396,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
public abstract boolean hasAutoComplete(ScalarModel scalarModel);
public abstract List<ObjectAdapter> getAutoComplete(ScalarModel scalarModel, String searchArg);
+ public abstract int getAutoCompleteOrChoicesMinLength(ScalarModel scalarModel);
public abstract void resetVersion(ScalarModel scalarModel);
@@ -378,6 +405,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
public abstract Integer getLength(ScalarModel scalarModel);
public abstract Integer getScale(ScalarModel scalarModel);
+
}
private final Kind kind;
@@ -592,5 +620,13 @@ public class ScalarModel extends EntityModel implements LinksProvider {
return Collections.unmodifiableList(entityActions);
}
+ /**
+ * @return
+ */
+ public int getAutoCompleteMinLength() {
+ return kind.getAutoCompleteOrChoicesMinLength(this);
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
index 62c655b..d93c45a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
@@ -75,8 +75,6 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
private static final String ID_ENTITY_CLEAR_LINK = "entityClearLink";
private static final String ID_FEEDBACK = "feedback";
- private static final int MIN_INPUT_LENGTH = 1;
-
private Select2Choice<ObjectAdapterMemento> autoCompleteField;
private Link<String> entityDetailsLink;
private Link<String> entityClearLink;
@@ -215,7 +213,9 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
};
autoCompleteField = new Select2Choice<ObjectAdapterMemento>(ID_AUTO_COMPLETE, model, provider);
final Settings settings = autoCompleteField.getSettings();
- settings.setMinimumInputLength(MIN_INPUT_LENGTH);
+
+ ScalarModel scalarModel = (ScalarModel) getEntityModel();
+ settings.setMinimumInputLength(scalarModel.getAutoCompleteMinLength());
addOrReplace(autoCompleteField);
// no need for link, since can see in drop-down
@@ -231,7 +231,7 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
@Override
protected String getDisplayText(ObjectAdapterMemento choice) {
- return choice.getObjectAdapter(ConcurrencyChecking.NO_CHECK).titleString();
+ return choice.getObjectAdapter(ConcurrencyChecking.NO_CHECK).titleString(null);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
new file mode 100644
index 0000000..f24b39c
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.applib.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The minimum entry length of an autocomplete search argument.
+ */
+@Inherited
+@Target({ ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MinLength {
+ int value();
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
index ac685de..1dab702 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
@@ -33,4 +33,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
public interface ActionParameterAutoCompleteFacet extends Facet {
public Object[] autoComplete(ObjectAdapter inObject, String searchArg);
+ /**
+ * The minimum number of characters that need to be entered.
+ */
+ public int getMinLength();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java
index 4fa376d..ecd78c1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java
@@ -41,4 +41,8 @@ public interface PropertyAutoCompleteFacet extends Facet {
* Gets the available auto-complete choices for this property.
*/
public Object[] autoComplete(ObjectAdapter inObject, String searchArg);
+ /**
+ * The minimum number of characters that need to be entered.
+ */
+ public int getMinLength();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
index aa8ac06..da34278 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
@@ -26,6 +26,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -167,15 +168,22 @@ public class ServicesInjectorDefault implements ServicesInjectorSpi {
private static void injectServices(final Object object, final List<Object> services) {
final Class<?> cls = object.getClass();
- final Method[] methods = cls.getMethods();
-
- for (int j = 0; j < methods.length; j++) {
+
+ final List<Method> methods = Arrays.asList(cls.getMethods());
+ final Iterable<Method> setterAndInjectorMethods = Iterables.filter(methods, new Predicate<Method>(){
+ public boolean apply(Method method) {
+ final String methodName = method.getName();
+ return methodName.startsWith("set") || methodName.startsWith("inject");
+ }
+ });
+
+ for (final Method method : setterAndInjectorMethods) {
for (final Object service : services) {
final Class<?> serviceClass = service.getClass();
- boolean isInjectorMethod = isInjectorMethodFor(methods[j], serviceClass);
+ boolean isInjectorMethod = isInjectorMethodFor(method, serviceClass);
if(isInjectorMethod) {
- methods[j].setAccessible(true);
- invokeSetMethod(methods[j], object, service);
+ method.setAccessible(true);
+ invokeSetMethod(method, object, service);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 7618306..956b4bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -108,7 +108,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
ObjectAdapter[] getChoices(ObjectAdapter adapter);
/**
- * Whether there are any choices provided (eg <tt>choicesXxx</tt> supporting
+ * Whether there is an autoComplete provided (eg <tt>autoCompleteXxx</tt> supporting
* method) for the parameter.
*/
boolean hasAutoComplete();
@@ -119,7 +119,10 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
*/
ObjectAdapter[] getAutoComplete(ObjectAdapter adapter, String searchArg);
+ int getAutoCompleteMinLength();
+
ObjectAdapter getDefault(ObjectAdapter adapter);
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index 985da7c..e19897f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -64,6 +64,8 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
*/
public ObjectAdapter[] getAutoComplete(ObjectAdapter object, String searchArg);
+ int getAutoCompleteMinLength();
+
/**
* Returns true if calculated from other data in the object, that is, should
* not be persisted.
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
index 2355a90..ac17414 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
@@ -92,4 +92,5 @@ public interface OneToOneAssociation extends ObjectAssociation, OneToOneFeature,
@Deprecated
void clearAssociation(ObjectAdapter inObject);
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 6d30d32..8fac3b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -46,7 +46,6 @@ import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacetUtils;
-import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.param.autocomplete.ActionParameterAutoCompleteFacet;
import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
@@ -58,6 +57,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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.progmodel.facets.param.autocomplete.MinLengthUtil;
public abstract class ObjectActionParameterAbstract implements ObjectActionParameter {
@@ -296,6 +296,12 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return autoCompleteChoiceAdapters.toArray(new ObjectAdapter[0]);
}
+ @Override
+ public int getAutoCompleteMinLength() {
+ final ActionParameterAutoCompleteFacet facet = getFacet(ActionParameterAutoCompleteFacet.class);
+ return facet != null? facet.getMinLength(): MinLengthUtil.MIN_LENGTH_DEFAULT;
+ }
+
private <T> void addParameterChoicesForBounded(final List<ObjectAdapter> parameterChoices) {
final Query<T> query = new QueryFindAllInstances<T>(getSpecification().getFullIdentifier());
final List<ObjectAdapter> allInstancesAdapter = getQuerySubmitter().allMatchingQuery(query);
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
index d18f532..a4bdf37 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
@@ -231,6 +231,11 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
public ObjectAdapter[] getAutoComplete(ObjectAdapter object, String searchArg) {
return new ObjectAdapter[0];
}
+
+ @Override
+ public int getAutoCompleteMinLength() {
+ return 0; // n/a
+ }
// /////////////////////////////////////////////////////////////
// getInstance
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
index 4b2885d..4298ad4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
@@ -54,6 +54,7 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.progmodel.facets.param.autocomplete.MinLengthUtil;
public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {
@@ -283,6 +284,13 @@ public class OneToOneAssociationImpl extends ObjectAssociationAbstract implement
return null;
}
+ @Override
+ public int getAutoCompleteMinLength() {
+ final PropertyAutoCompleteFacet propertyAutoCompleteFacet = getFacet(PropertyAutoCompleteFacet.class);
+ return propertyAutoCompleteFacet != null? propertyAutoCompleteFacet.getMinLength(): MinLengthUtil.MIN_LENGTH_DEFAULT;
+ }
+
+
// /////////////////////////////////////////////////////////////
// getInstance
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
index cf57153..a53cee8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
@@ -46,6 +46,9 @@ public abstract class ActionParameterAutoCompleteFacetAbstract extends FacetAbst
return type != null ? getSpecificationLookup().loadSpecification(type) : null;
}
+ @Override
+ public abstract int getMinLength();
+
// /////////////////////////////////////////////////////////
// Dependencies
// /////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
index f4a908a..2a07292 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
@@ -37,11 +37,13 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
private final Method method;
private final Class<?> choicesType;
+ private final int minLength;
public ActionParameterAutoCompleteFacetViaMethod(final Method method, final Class<?> choicesType, final FacetHolder holder, final SpecificationLoader specificationLookup, final AdapterManager adapterManager) {
super(holder, specificationLookup, adapterManager);
this.method = method;
this.choicesType = choicesType;
+ this.minLength = MinLengthUtil.determineMinLength(method);
}
/**
@@ -52,6 +54,11 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
public List<Method> getMethods() {
return Collections.singletonList(method);
}
+
+ @Override
+ public int getMinLength() {
+ return minLength;
+ }
@Override
public boolean impliesResolve() {
@@ -82,4 +89,5 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
return "method=" + method + ",type=" + choicesType;
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/MinLengthUtil.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/MinLengthUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/MinLengthUtil.java
new file mode 100644
index 0000000..9f77c38
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/MinLengthUtil.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.isis.core.progmodel.facets.param.autocomplete;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import org.apache.isis.applib.annotation.MinLength;
+
+public class MinLengthUtil {
+
+ /**
+ * Finds the value of the {@link MinLength} annotation on the first parameter of the
+ * supplied method.
+ */
+ public static int determineMinLength(final Method method) {
+ final Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+ if(parameterAnnotations.length == 1) {
+ final Annotation[] searchArgAnnotations = parameterAnnotations[0];
+ for(Annotation annotation: searchArgAnnotations) {
+ if(annotation instanceof MinLength) {
+ MinLength minLength = (MinLength) annotation;
+ return minLength.value();
+ }
+ }
+ }
+ return MinLengthUtil.MIN_LENGTH_DEFAULT;
+ }
+
+ public static final int MIN_LENGTH_DEFAULT = 1;
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java
index ddd9ddb..3808c7e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java
@@ -23,8 +23,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.properties.autocomplete.PropertyAutoCompleteFacet;
-import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
public abstract class PropertyAutoCompleteFacetAbstract extends FacetAbstract implements PropertyAutoCompleteFacet {
@@ -36,5 +34,7 @@ public abstract class PropertyAutoCompleteFacetAbstract extends FacetAbstract im
super(type(), holder, Derivation.NOT_DERIVED);
}
+ @Override
+ public abstract int getMinLength();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
index 470cb86..2e98f1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
@@ -32,11 +32,13 @@ import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.progmodel.facets.CollectionUtils;
+import org.apache.isis.core.progmodel.facets.param.autocomplete.MinLengthUtil;
public class PropertyAutoCompleteFacetViaMethod extends PropertyAutoCompleteFacetAbstract implements ImperativeFacet {
private final Method method;
private final Class<?> choicesClass;
+ private final int minLength;
private final AdapterManager adapterManager;
private SpecificationLoader specificationLookup;
@@ -47,6 +49,7 @@ public class PropertyAutoCompleteFacetViaMethod extends PropertyAutoCompleteFace
this.choicesClass = choicesClass;
this.specificationLookup = specificationLookup;
this.adapterManager = adapterManager;
+ this.minLength = MinLengthUtil.determineMinLength(method);
}
/**
@@ -59,6 +62,11 @@ public class PropertyAutoCompleteFacetViaMethod extends PropertyAutoCompleteFace
}
@Override
+ public int getMinLength() {
+ return minLength;
+ }
+
+ @Override
public boolean impliesResolve() {
return true;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 344a3b8..8fa3a29 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -121,13 +121,11 @@ public class ObjectAssociationAbstractTest {
@Override
public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean hasAutoComplete() {
- // TODO Auto-generated method stub
return false;
}
@@ -135,6 +133,10 @@ public class ObjectAssociationAbstractTest {
public ObjectAdapter[] getAutoComplete(ObjectAdapter object, String searchArg) {
return null;
}
+ @Override
+ public int getAutoCompleteMinLength() {
+ return 0;
+ }
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 1c526b0..b359387 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -133,6 +133,10 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
public ObjectAdapter[] getAutoComplete(ObjectAdapter object, String searchArg) {
return null;
}
+ @Override
+ public int getAutoCompleteMinLength() {
+ return 0;
+ }
};
context.checking(new Expectations() {
http://git-wip-us.apache.org/repos/asf/isis/blob/050e9e32/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 8995291..65ce9c9 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -46,6 +46,7 @@ import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberGroups;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.NotPersisted;
@@ -377,8 +378,9 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
getDependencies().add(toDoItem);
return this;
}
- public List<ToDoItem> autoComplete0Add(final String search) {
+ public List<ToDoItem> autoComplete0Add(final @MinLength(2) String search) {
final List<ToDoItem> list = toDoItems.autoComplete(search);
+ list.removeAll(getDependencies());
list.remove(this);
return list;
}