diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java index d3501e095..7d41df9c9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java @@ -23,6 +23,8 @@ import org.codelibs.fess.app.service.PathMappingService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.PathMapping; +import org.codelibs.fess.helper.SystemHelper; +import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.RenderDataUtil; import org.dbflute.optional.OptionalEntity; import org.dbflute.optional.OptionalThing; @@ -226,7 +228,7 @@ public class AdminPathmapAction extends FessAdminAction { // =================================================================================== // Assist Logic // ============ - private OptionalEntity getEntity(final CreateForm form, final String username, final long currentTime) { + private static OptionalEntity getEntity(final CreateForm form, final String username, final long currentTime) { switch (form.crudMode) { case CrudMode.CREATE: return OptionalEntity.of(new PathMapping()).map(entity -> { @@ -236,7 +238,7 @@ public class AdminPathmapAction extends FessAdminAction { }); case CrudMode.EDIT: if (form instanceof EditForm) { - return pathMappingService.getPathMapping(((EditForm) form).id); + return ComponentUtil.getComponent(PathMappingService.class).getPathMapping(((EditForm) form).id); } break; default: @@ -245,7 +247,8 @@ public class AdminPathmapAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity getPathMapping(final CreateForm form) { + public static OptionalEntity getPathMapping(final CreateForm form) { + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java new file mode 100644 index 000000000..36e820f17 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java @@ -0,0 +1,123 @@ +/* + * Copyright 2012-2017 CodeLibs Project and the Others. + * + * Licensed 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.codelibs.fess.app.web.api.admin.pathmap; + +import static org.codelibs.fess.app.web.admin.pathmap.AdminPathmapAction.getPathMapping; + +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.Resource; + +import org.codelibs.fess.Constants; +import org.codelibs.fess.app.pager.PathMapPager; +import org.codelibs.fess.app.service.PathMappingService; +import org.codelibs.fess.app.web.CrudMode; +import org.codelibs.fess.app.web.api.ApiResult; +import org.codelibs.fess.app.web.api.admin.FessApiAdminAction; +import org.codelibs.fess.es.config.exentity.PathMapping; +import org.lastaflute.web.Execute; +import org.lastaflute.web.response.JsonResponse; + +public class ApiAdminPathmapAction extends FessApiAdminAction { + + @Resource + private PathMappingService pathMappingService; + + // GET /api/admin/pathmap + // POST /api/admin/pathmap + @Execute + public JsonResponse settings(final SearchBody body) { + validateApi(body, messages -> {}); + final PathMapPager pager = new PathMapPager(); + copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final List list = pathMappingService.getPathMappingList(pager); + return asJson(new ApiResult.ApiConfigsResponse() + .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) + .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result()); + } + + // GET /api/admin/pathmap/setting/{id} + @Execute + public JsonResponse get$setting(final String id) { + return asJson(new ApiResult.ApiConfigResponse() + .setting(pathMappingService.getPathMapping(id).map(entity -> createEditBody(entity)).orElseGet(() -> { + throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id)); + return null; + })).status(ApiResult.Status.OK).result()); + } + + // PUT /api/admin/pathmap/setting + @Execute + public JsonResponse put$setting(final CreateBody body) { + validateApi(body, messages -> {}); + body.crudMode = CrudMode.CREATE; + final PathMapping entity = getPathMapping(body).orElseGet(() -> { + throwValidationErrorApi(messages -> { + messages.addErrorsCrudFailedToCreateInstance(GLOBAL); + }); + return null; + }); + try { + pathMappingService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (final Exception e) { + throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); + } + return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); + } + + // POST /api/admin/pathmap/setting + @Execute + public JsonResponse post$setting(final EditBody body) { + validateApi(body, messages -> {}); + body.crudMode = CrudMode.EDIT; + final PathMapping entity = getPathMapping(body).orElseGet(() -> { + throwValidationErrorApi(messages -> { + messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, body.id); + }); + return null; + }); + try { + pathMappingService.store(entity); + } catch (final Exception e) { + throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); + } + return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(false).status(ApiResult.Status.OK).result()); + } + + // DELETE /api/admin/pathmap/setting/{id} + @Execute + public JsonResponse delete$setting(final String id) { + final PathMapping entity = pathMappingService.getPathMapping(id).orElseGet(() -> { + throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id)); + return null; + }); + try { + pathMappingService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (final Exception e) { + throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); + } + return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); + } + + protected EditBody createEditBody(final PathMapping entity) { + final EditBody body = new EditBody(); + copyBeanToBean(entity, body, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + return body; + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java new file mode 100644 index 000000000..385ca21f5 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2017 CodeLibs Project and the Others. + * + * Licensed 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.codelibs.fess.app.web.api.admin.pathmap; + +import org.codelibs.fess.app.web.admin.pathmap.CreateForm; + +public class CreateBody extends CreateForm { +} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java new file mode 100644 index 000000000..e923c1f32 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2017 CodeLibs Project and the Others. + * + * Licensed 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.codelibs.fess.app.web.api.admin.pathmap; + +import org.codelibs.fess.app.web.admin.pathmap.EditForm; + +public class EditBody extends EditForm { +} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java new file mode 100644 index 000000000..6db0f31de --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2017 CodeLibs Project and the Others. + * + * Licensed 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.codelibs.fess.app.web.api.admin.pathmap; + +import org.codelibs.fess.app.web.admin.pathmap.SearchForm; + +public class SearchBody extends SearchForm { +}