|
@@ -317,7 +317,7 @@ public class AdminSearchlistAction extends FessAdminAction {
|
|
|
protected void validateCreateFields(final CreateForm form) {
|
|
|
|
|
|
if (!fessConfig.validateIndexRequiredFields(form.doc)) {
|
|
|
- List<String> invalidRequiredFields = fessConfig.invalidIndexRequiredFields(form.doc);
|
|
|
+ final List<String> invalidRequiredFields = fessConfig.invalidIndexRequiredFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidRequiredFields.get(0));
|
|
|
// TODO messages.addConstraintsRequiredMessage("doc." + invalidRequiredFields.get(0), invalidRequiredFields.get(0));
|
|
@@ -325,37 +325,37 @@ public class AdminSearchlistAction extends FessAdminAction {
|
|
|
}
|
|
|
|
|
|
if (!fessConfig.validateIndexArrayFields(form.doc)) {
|
|
|
- List<String> invalidArrayFields = fessConfig.invalidIndexArrayFields(form.doc);
|
|
|
+ final List<String> invalidArrayFields = fessConfig.invalidIndexArrayFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidArrayFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexDateFields(form.doc)) {
|
|
|
- List<String> invalidDateFields = fessConfig.invalidIndexDateFields(form.doc);
|
|
|
+ final List<String> invalidDateFields = fessConfig.invalidIndexDateFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidDateFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexIntegerFields(form.doc)) {
|
|
|
- List<String> invalidIntegerFields = fessConfig.invalidIndexIntegerFields(form.doc);
|
|
|
+ final List<String> invalidIntegerFields = fessConfig.invalidIndexIntegerFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidIntegerFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexLongFields(form.doc)) {
|
|
|
- List<String> invalidLongFields = fessConfig.invalidIndexLongFields(form.doc);
|
|
|
+ final List<String> invalidLongFields = fessConfig.invalidIndexLongFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidLongFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexFloatFields(form.doc)) {
|
|
|
- List<String> invalidFloatFields = fessConfig.invalidIndexFloatFields(form.doc);
|
|
|
+ final List<String> invalidFloatFields = fessConfig.invalidIndexFloatFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidFloatFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexDoubleFields(form.doc)) {
|
|
|
- List<String> invalidDoubleFields = fessConfig.invalidIndexDoubleFields(form.doc);
|
|
|
+ final List<String> invalidDoubleFields = fessConfig.invalidIndexDoubleFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudFailedToCreateInstance("doc." + invalidDoubleFields.get(0));
|
|
|
}, () -> asEditHtml());
|
|
@@ -365,44 +365,44 @@ public class AdminSearchlistAction extends FessAdminAction {
|
|
|
protected void validateUpdateFields(final EditForm form) {
|
|
|
|
|
|
if (!fessConfig.validateIndexRequiredFields(form.doc)) {
|
|
|
- List<String> invalidRequiredFields = fessConfig.invalidIndexRequiredFields(form.doc);
|
|
|
+ final List<String> invalidRequiredFields = fessConfig.invalidIndexRequiredFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidRequiredFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
|
|
|
if (!fessConfig.validateIndexArrayFields(form.doc)) {
|
|
|
- List<String> invalidArrayFields = fessConfig.invalidIndexArrayFields(form.doc);
|
|
|
+ final List<String> invalidArrayFields = fessConfig.invalidIndexArrayFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidArrayFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexDateFields(form.doc)) {
|
|
|
- List<String> invalidDateFields = fessConfig.invalidIndexDateFields(form.doc);
|
|
|
+ final List<String> invalidDateFields = fessConfig.invalidIndexDateFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidDateFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexIntegerFields(form.doc)) {
|
|
|
- List<String> invalidIntegerFields = fessConfig.invalidIndexIntegerFields(form.doc);
|
|
|
+ final List<String> invalidIntegerFields = fessConfig.invalidIndexIntegerFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidIntegerFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexLongFields(form.doc)) {
|
|
|
- List<String> invalidLongFields = fessConfig.invalidIndexLongFields(form.doc);
|
|
|
+ final List<String> invalidLongFields = fessConfig.invalidIndexLongFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidLongFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexFloatFields(form.doc)) {
|
|
|
- List<String> invalidFloatFields = fessConfig.invalidIndexFloatFields(form.doc);
|
|
|
+ final List<String> invalidFloatFields = fessConfig.invalidIndexFloatFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidFloatFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
|
}
|
|
|
if (!fessConfig.validateIndexDoubleFields(form.doc)) {
|
|
|
- List<String> invalidDoubleFields = fessConfig.invalidIndexDoubleFields(form.doc);
|
|
|
+ final List<String> invalidDoubleFields = fessConfig.invalidIndexDoubleFields(form.doc);
|
|
|
throwValidationError(messages -> {
|
|
|
messages.addErrorsCrudCouldNotFindCrudTable("doc." + invalidDoubleFields.get(0), form.docId);
|
|
|
}, () -> asEditHtml());
|
|
@@ -423,7 +423,7 @@ public class AdminSearchlistAction extends FessAdminAction {
|
|
|
protected OptionalEntity<Map<String, Object>> getDoc(final CreateForm form) {
|
|
|
switch (form.crudMode) {
|
|
|
case CrudMode.CREATE:
|
|
|
- Map<String, Object> entity = new HashMap<>();
|
|
|
+ final Map<String, Object> entity = new HashMap<>();
|
|
|
entity.put(fessConfig.getIndexFieldDocId(), systemHelper.generateDocId(entity));
|
|
|
return OptionalEntity.of(entity);
|
|
|
case CrudMode.EDIT:
|