code improvement
This commit is contained in:
parent
b224490dde
commit
c0e1608f0a
17 changed files with 104 additions and 146 deletions
|
@ -390,4 +390,6 @@ public class Constants extends CoreLibConstants {
|
|||
public static final String CONFIG_CLEANUP_ALL = "cleanup.all";
|
||||
|
||||
public static final String GSA_API_VERSION = "3.2";
|
||||
|
||||
public static final String PERMISSIONS = "permissions";
|
||||
}
|
||||
|
|
|
@ -257,12 +257,7 @@ public class JsonApiManager extends BaseApiManager {
|
|||
if (geoInfo != null && geoInfo.toQueryBuilder() != null) {
|
||||
buf.append(',');
|
||||
buf.append("\"geo\":");
|
||||
try {
|
||||
final XContentBuilder builder = XContentFactory.jsonBuilder();
|
||||
buf.append(geoInfo.toQueryBuilder().toXContent(builder, ToXContent.EMPTY_PARAMS).string());
|
||||
} catch (final Exception e) {
|
||||
buf.append("{ \"error\" : \"").append(ExceptionsHelper.detailedMessage(e)).append("\"}");
|
||||
}
|
||||
buf.append(toGeoRequestString(geoInfo));
|
||||
}
|
||||
}
|
||||
} catch (final Exception e) {
|
||||
|
@ -280,6 +275,15 @@ public class JsonApiManager extends BaseApiManager {
|
|||
|
||||
}
|
||||
|
||||
protected String toGeoRequestString(final GeoInfo geoInfo) {
|
||||
try {
|
||||
final XContentBuilder builder = XContentFactory.jsonBuilder();
|
||||
return geoInfo.toQueryBuilder().toXContent(builder, ToXContent.EMPTY_PARAMS).string();
|
||||
} catch (final Exception e) {
|
||||
return "{\"error\":\"" + ExceptionsHelper.detailedMessage(e) + "\"}";
|
||||
}
|
||||
}
|
||||
|
||||
protected void processLabelRequest(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) {
|
||||
final LabelTypeHelper labelTypeHelper = ComponentUtil.getLabelTypeHelper();
|
||||
|
||||
|
|
|
@ -150,10 +150,6 @@ public class CrawlingInfoService {
|
|||
}
|
||||
}
|
||||
|
||||
public CrawlingInfo get(final String sessionId) {
|
||||
return crawlingInfoBhv.selectEntity(cb -> cb.query().setSessionId_Equal(sessionId)).orElse(null);//TODO
|
||||
}
|
||||
|
||||
public void storeInfo(final List<CrawlingInfoParam> crawlingInfoParamList) {
|
||||
if (crawlingInfoParamList == null) {
|
||||
throw new FessSystemException("Crawling Session Info is null.");
|
||||
|
|
|
@ -198,7 +198,7 @@ public class ElevateWordService {
|
|||
try {
|
||||
final String[] permissions =
|
||||
stream(getValue(list, 2).split(",")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
stream -> stream.map(permissionHelper::encode).filter(StringUtil::isNotBlank).distinct()
|
||||
.toArray(n -> new String[n]));
|
||||
final String label = getValue(list, 3);
|
||||
ElevateWord elevateWord = elevateWordBhv.selectEntity(cb -> {
|
||||
|
@ -259,9 +259,7 @@ public class ElevateWordService {
|
|||
list.add("Boost");
|
||||
csvWriter.writeValues(list);
|
||||
|
||||
elevateWordBhv.selectCursor(cb -> {
|
||||
cb.query().matchAll();
|
||||
}, new EntityRowHandler<ElevateWord>() {
|
||||
elevateWordBhv.selectCursor(cb -> cb.query().matchAll(), new EntityRowHandler<ElevateWord>() {
|
||||
@Override
|
||||
public void handle(final ElevateWord entity) {
|
||||
final List<String> list = new ArrayList<>();
|
||||
|
|
|
@ -84,9 +84,7 @@ public class GroupService {
|
|||
});
|
||||
|
||||
userBhv.selectCursor(
|
||||
cb -> {
|
||||
cb.query().setGroups_Equal(group.getId());
|
||||
},
|
||||
cb -> cb.query().setGroups_Equal(group.getId()),
|
||||
entity -> {
|
||||
entity.setGroups(stream(entity.getGroups()).get(
|
||||
stream -> stream.filter(s -> !s.equals(group.getId())).toArray(n -> new String[n])));
|
||||
|
|
|
@ -81,9 +81,7 @@ public class RoleService {
|
|||
});
|
||||
|
||||
userBhv.selectCursor(
|
||||
cb -> {
|
||||
cb.query().setRoles_Equal(role.getId());
|
||||
},
|
||||
cb -> cb.query().setRoles_Equal(role.getId()),
|
||||
entity -> {
|
||||
entity.setRoles(stream(entity.getRoles()).get(
|
||||
stream -> stream.filter(s -> !s.equals(role.getId())).toArray(n -> new String[n])));
|
||||
|
|
|
@ -116,9 +116,8 @@ public class AdminBackupAction extends FessAdminAction {
|
|||
}
|
||||
|
||||
private HtmlResponse asListHtml() {
|
||||
return asHtml(path_AdminBackup_AdminBackupJsp).useForm(UploadForm.class).renderWith(data -> {
|
||||
RenderDataUtil.register(data, "backupItems", getBackupItems());
|
||||
});
|
||||
return asHtml(path_AdminBackup_AdminBackupJsp).useForm(UploadForm.class).renderWith(
|
||||
data -> RenderDataUtil.register(data, "backupItems", getBackupItems()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -145,12 +145,12 @@ public class AdminDataconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
|
||||
.collect(Collectors.joining("\n")));
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
|
||||
|
@ -183,7 +183,7 @@ public class AdminDataconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -193,10 +193,8 @@ public class AdminDataconfigAction extends FessAdminAction {
|
|||
.collect(Collectors.joining("\n")));
|
||||
form.crudMode = crudMode;
|
||||
})
|
||||
.orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml());
|
||||
});
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml()));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -262,9 +260,9 @@ public class AdminDataconfigAction extends FessAdminAction {
|
|||
messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
|
||||
() -> asEditHtml());
|
||||
}
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml());
|
||||
});
|
||||
})
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asDetailsHtml()));
|
||||
return redirect(getClass());
|
||||
}
|
||||
|
||||
|
@ -297,11 +295,8 @@ public class AdminDataconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
entity.setUpdatedBy(username);
|
||||
entity.setUpdatedTime(currentTime);
|
||||
copyBeanToBean(
|
||||
form,
|
||||
entity,
|
||||
op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of("permissions")).toArray(
|
||||
n -> new String[n])));
|
||||
copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
|
||||
Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
entity.setPermissions(stream(form.permissions.split("\n")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
|
|
|
@ -130,7 +130,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
|
|||
throwValidationError(messages -> messages.addErrorsDesignFileNameIsNotFound("designFile"), () -> asListHtml());
|
||||
}
|
||||
|
||||
File uploadFile = null;
|
||||
File uploadFile;
|
||||
// normalize filename
|
||||
if (checkFileType(fileName, fessConfig.getSupportedUploadedMediaExtentionsAsArray())
|
||||
&& checkFileType(uploadedFileName, fessConfig.getSupportedUploadedMediaExtentionsAsArray())) {
|
||||
|
|
|
@ -272,9 +272,7 @@ public class AdminDictSeunjeonAction extends FessAdminAction {
|
|||
createSeunjeonItem(form, () -> asEditHtml()).ifPresent(entity -> {
|
||||
seunjeonService.store(form.dictId, entity);
|
||||
saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml());
|
||||
});
|
||||
}).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()));
|
||||
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
|
||||
}
|
||||
|
||||
|
@ -286,9 +284,9 @@ public class AdminDictSeunjeonAction extends FessAdminAction {
|
|||
createSeunjeonItem(form, () -> asEditHtml()).ifPresent(entity -> {
|
||||
seunjeonService.store(form.dictId, entity);
|
||||
saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), () -> asEditHtml());
|
||||
});
|
||||
}).orElse(
|
||||
() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
|
||||
() -> asEditHtml()));
|
||||
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
|
||||
}
|
||||
|
||||
|
|
|
@ -150,7 +150,7 @@ public class AdminElevatewordAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -178,34 +178,27 @@ public class AdminElevatewordAction extends FessAdminAction {
|
|||
public HtmlResponse details(final int crudMode, final String id) {
|
||||
verifyCrudMode(crudMode, CrudMode.DETAILS);
|
||||
saveToken();
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
return asHtml(path_AdminElevateword_AdminElevatewordDetailsJsp).useForm(
|
||||
EditForm.class,
|
||||
op -> {
|
||||
op.setup(form -> {
|
||||
elevateWordService
|
||||
.getElevateWord(id)
|
||||
.ifPresent(
|
||||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(s -> permissionHelper.decode(s))
|
||||
.filter(StringUtil::isNotBlank).distinct()
|
||||
.collect(Collectors.joining("\n")));
|
||||
form.crudMode = crudMode;
|
||||
})
|
||||
.orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml());
|
||||
});
|
||||
});
|
||||
}).renderWith(data -> {
|
||||
registerLabels(data);
|
||||
});
|
||||
op -> op.setup(form -> {
|
||||
elevateWordService
|
||||
.getElevateWord(id)
|
||||
.ifPresent(
|
||||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank)
|
||||
.distinct().collect(Collectors.joining("\n")));
|
||||
form.crudMode = crudMode;
|
||||
})
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml()));
|
||||
})).renderWith(data -> registerLabels(data));
|
||||
}
|
||||
|
||||
// -----------------------------------------------------
|
||||
|
@ -313,9 +306,9 @@ public class AdminElevatewordAction extends FessAdminAction {
|
|||
messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
|
||||
() -> asEditHtml());
|
||||
}
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml());
|
||||
});
|
||||
})
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asDetailsHtml()));
|
||||
return redirect(getClass());
|
||||
}
|
||||
|
||||
|
@ -366,14 +359,11 @@ public class AdminElevatewordAction extends FessAdminAction {
|
|||
entity -> {
|
||||
entity.setUpdatedBy(username);
|
||||
entity.setUpdatedTime(currentTime);
|
||||
copyBeanToBean(
|
||||
form,
|
||||
entity,
|
||||
op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of("permissions")).toArray(
|
||||
n -> new String[n])));
|
||||
copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
|
||||
Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
entity.setPermissions(stream(form.permissions.split("\n")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
stream -> stream.map(permissionHelper::encode).filter(StringUtil::isNotBlank).distinct()
|
||||
.toArray(n -> new String[n])));
|
||||
return entity;
|
||||
});
|
||||
|
|
|
@ -133,6 +133,7 @@ public class AdminFileconfigAction extends FessAdminAction {
|
|||
@Execute
|
||||
public HtmlResponse edit(final EditForm form) {
|
||||
validate(form, messages -> {}, () -> asListHtml());
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
final String id = form.id;
|
||||
fileConfigService
|
||||
.getFileConfig(id)
|
||||
|
@ -140,16 +141,14 @@ public class AdminFileconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
|
||||
.collect(Collectors.joining("\n")));
|
||||
}).orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
|
||||
});
|
||||
})
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()));
|
||||
saveToken();
|
||||
if (form.crudMode.intValue() == CrudMode.EDIT) {
|
||||
// back
|
||||
|
@ -170,32 +169,26 @@ public class AdminFileconfigAction extends FessAdminAction {
|
|||
saveToken();
|
||||
return asHtml(path_AdminFileconfig_AdminFileconfigDetailsJsp).useForm(
|
||||
EditForm.class,
|
||||
op -> {
|
||||
op.setup(form -> {
|
||||
fileConfigService
|
||||
.getFileConfig(id)
|
||||
.ifPresent(
|
||||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(s -> permissionHelper.decode(s))
|
||||
.filter(StringUtil::isNotBlank).distinct()
|
||||
.collect(Collectors.joining("\n")));
|
||||
form.crudMode = crudMode;
|
||||
})
|
||||
.orElse(() -> {
|
||||
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml());
|
||||
});
|
||||
});
|
||||
}).renderWith(data -> {
|
||||
registerRolesAndLabels(data);
|
||||
});
|
||||
op -> op.setup(form -> {
|
||||
fileConfigService
|
||||
.getFileConfig(id)
|
||||
.ifPresent(
|
||||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
stream(entity.getPermissions()).get(
|
||||
stream -> stream.map(s -> permissionHelper.decode(s))
|
||||
.filter(StringUtil::isNotBlank).distinct()
|
||||
.collect(Collectors.joining("\n")));
|
||||
form.crudMode = crudMode;
|
||||
})
|
||||
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
|
||||
() -> asListHtml()));
|
||||
})).renderWith(data -> registerRolesAndLabels(data));
|
||||
}
|
||||
|
||||
// -----------------------------------------------------
|
||||
|
@ -294,11 +287,8 @@ public class AdminFileconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
entity.setUpdatedBy(username);
|
||||
entity.setUpdatedTime(currentTime);
|
||||
copyBeanToBean(
|
||||
form,
|
||||
entity,
|
||||
op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of("permissions")).toArray(
|
||||
n -> new String[n])));
|
||||
copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
|
||||
Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
entity.setPermissions(stream(form.permissions.split("\n")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
|
|
|
@ -138,7 +138,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -176,7 +176,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -293,11 +293,8 @@ public class AdminLabeltypeAction extends FessAdminAction {
|
|||
entity -> {
|
||||
entity.setUpdatedBy(username);
|
||||
entity.setUpdatedTime(currentTime);
|
||||
copyBeanToBean(
|
||||
form,
|
||||
entity,
|
||||
op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of("permissions")).toArray(
|
||||
n -> new String[n])));
|
||||
copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
|
||||
Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
entity.setPermissions(stream(form.permissions.split("\n")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
|
|
|
@ -142,7 +142,7 @@ public class AdminWebconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -180,7 +180,7 @@ public class AdminWebconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
copyBeanToBean(entity, form, copyOp -> {
|
||||
copyOp.excludeNull();
|
||||
copyOp.exclude("permissions");
|
||||
copyOp.exclude(Constants.PERMISSIONS);
|
||||
});
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
form.permissions =
|
||||
|
@ -294,11 +294,8 @@ public class AdminWebconfigAction extends FessAdminAction {
|
|||
entity -> {
|
||||
entity.setUpdatedBy(username);
|
||||
entity.setUpdatedTime(currentTime);
|
||||
copyBeanToBean(
|
||||
form,
|
||||
entity,
|
||||
op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of("permissions")).toArray(
|
||||
n -> new String[n])));
|
||||
copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
|
||||
Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
|
||||
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
|
||||
entity.setPermissions(stream(form.permissions.split("\n")).get(
|
||||
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
|
||||
|
|
|
@ -69,7 +69,7 @@ public class GeoInfo {
|
|||
} catch (final Exception ex) {
|
||||
throw new InvalidQueryException(messages -> messages
|
||||
.addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), ex
|
||||
.getLocalizedMessage());
|
||||
.getLocalizedMessage(), ex);
|
||||
}
|
||||
} else {
|
||||
throw new InvalidQueryException(messages -> messages
|
||||
|
@ -88,7 +88,7 @@ public class GeoInfo {
|
|||
return list.get(0);
|
||||
} else if (list.size() > 1) {
|
||||
final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
|
||||
list.forEach(q -> boolQuery.should(q));
|
||||
list.forEach(boolQuery::should);
|
||||
return boolQuery;
|
||||
}
|
||||
return null;
|
||||
|
@ -98,7 +98,7 @@ public class GeoInfo {
|
|||
builder = queryBuilders[0];
|
||||
} else if (queryBuilders.length > 1) {
|
||||
final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
|
||||
stream(queryBuilders).of(stream -> stream.forEach(q -> boolQuery.must(q)));
|
||||
stream(queryBuilders).of(stream -> stream.forEach(boolQuery::must));
|
||||
builder = boolQuery;
|
||||
}
|
||||
|
||||
|
|
|
@ -55,9 +55,7 @@ import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class Crawler implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Crawler {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(Crawler.class);
|
||||
|
||||
|
|
|
@ -79,20 +79,18 @@ public class SuggestHelper {
|
|||
public void init() {
|
||||
fessConfig = ComponentUtil.getFessConfig();
|
||||
split(fessConfig.getSuggestFieldContents(), ",").of(
|
||||
stream -> stream.filter(StringUtil::isNotBlank).forEach(f -> contentFieldNameSet.add(f)));
|
||||
split(fessConfig.getSuggestFieldTags(), ",").of(
|
||||
stream -> stream.filter(StringUtil::isNotBlank).forEach(f -> tagFieldNameSet.add(f)));
|
||||
split(fessConfig.getSuggestFieldRoles(), ",").of(
|
||||
stream -> stream.filter(StringUtil::isNotBlank).forEach(f -> roleFieldNameSet.add(f)));
|
||||
stream -> stream.filter(StringUtil::isNotBlank).forEach(contentFieldNameSet::add));
|
||||
split(fessConfig.getSuggestFieldTags(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(tagFieldNameSet::add));
|
||||
split(fessConfig.getSuggestFieldRoles(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(roleFieldNameSet::add));
|
||||
contentFieldList = Arrays.asList(stream(fessConfig.getSuggestFieldContents()).get(stream -> stream.toArray(n -> new String[n])));
|
||||
|
||||
fessEsClient.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(fessConfig.getIndexHealthTimeout());
|
||||
|
||||
suggester = Suggester.builder().build(fessEsClient, fessConfig.getIndexDocumentSearchIndex());
|
||||
suggester.settings().array().delete(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS);
|
||||
split(fessConfig.getSuggestFieldIndexContents(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(field -> {
|
||||
suggester.settings().array().add(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS, field);
|
||||
}));
|
||||
split(fessConfig.getSuggestFieldIndexContents(), ",").of(
|
||||
stream -> stream.filter(StringUtil::isNotBlank).forEach(
|
||||
field -> suggester.settings().array().add(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS, field)));
|
||||
suggester.createIndexIfNothing();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue