Compare commits
3 commits
master
...
fess-14.18
| Author | SHA1 | Date | |
|---|---|---|---|
|
f80acf08a1 | ||
|
|
84178f793b | ||
|
|
d6248035a3 |
806 changed files with 6497 additions and 5762 deletions
6
.github/workflows/maven.yml
vendored
6
.github/workflows/maven.yml
vendored
|
|
@ -16,14 +16,14 @@ on:
|
|||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: macos-14
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 21
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '21'
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
|
|
|
|||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -6,8 +6,7 @@
|
|||
/src/main/webapp/WEB-INF/classes/
|
||||
/src/main/webapp/WEB-INF/lib/
|
||||
/src/main/webapp/WEB-INF/site/
|
||||
/src/main/webapp/WEB-INF/plugin/*
|
||||
!/src/main/webapp/WEB-INF/plugin/.keep
|
||||
/src/main/webapp/WEB-INF/plugin/
|
||||
/src/main/webapp/WEB-INF/env/crawler/lib/
|
||||
/src/main/webapp/WEB-INF/env/suggest/lib/
|
||||
/src/main/webapp/WEB-INF/env/thumbnail/lib/
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -8,7 +8,7 @@
|
|||
Fess is a very powerful and easily deployable Enterprise Search Server. You can quickly install and run Fess on any platform where you can run the Java Runtime Environment. Fess is provided under the [Apache License 2.0](LICENSE).
|
||||
|
||||
Fess is based on [OpenSearch](https://github.com/opensearch-project/OpenSearch), but knowledge/experience about OpenSearch is _not_ required. Fess provides an easy to use Administration GUI to configure the system via your browser.
|
||||
Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.18/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.18/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.18/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip.
|
||||
Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip.
|
||||
|
||||
*[Fess Site Search](https://github.com/codelibs/fess-site-search)* is a free alternative to [Google Site Search](https://enterprise.google.com/search/products/gss.html). For more details, see the [FSS JS Generator documentation](https://fss-generator.codelibs.org/docs/manual).
|
||||
|
||||
|
|
@ -26,15 +26,15 @@ There are 2 ways to try Fess. The first is to download and install yourself. The
|
|||
|
||||
### Download and Install/Run
|
||||
|
||||
Fess 14.18 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip.
|
||||
Fess 14.17 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip.
|
||||
|
||||
The following commands show how to use the zip download:
|
||||
|
||||
$ unzip fess-14.18.x.zip
|
||||
$ cd fess-14.18.x
|
||||
$ unzip fess-14.17.x.zip
|
||||
$ cd fess-14.17.x
|
||||
$ ./bin/fess
|
||||
|
||||
For more details, see the [Installation Guide](https://fess.codelibs.org/14.18/install/index.html).
|
||||
For more details, see the [Installation Guide](https://fess.codelibs.org/14.17/install/index.html).
|
||||
|
||||
### Docker
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ We provide Docker images on [ghcr.io](https://github.com/orgs/codelibs/packages)
|
|||
|
||||
|
||||
|
||||
You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.18/admin/scheduler-guide.html).
|
||||
You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.17/admin/scheduler-guide.html).
|
||||
|
||||
## Migration from another search provider
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ Please see [MIGRATION.md](MIGRATION.md).
|
|||
|
||||
## Data Store
|
||||
|
||||
Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.18/admin/dataconfig-guide.html):
|
||||
Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html):
|
||||
|
||||
- [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian)
|
||||
- [Box](https://github.com/codelibs/fess-ds-box)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<project name="dbflute" basedir=".">
|
||||
<property name="mydbflute.dir" value="${basedir}/mydbflute" />
|
||||
<property name="target.dir" value="${basedir}/target" />
|
||||
<property name="branch.name" value="fess-14.17" />
|
||||
<property name="branch.name" value="fess-14.18" />
|
||||
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
|
||||
|
||||
<target name="mydbflute.check">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
map:{
|
||||
# base package of generated classes
|
||||
; basePackage = org.codelibs.fess.opensearch
|
||||
; basePackage = org.codelibs.fess.es
|
||||
|
||||
# base path to JSON resource, URL or relative path
|
||||
; basePath = ../src/main/config/es
|
||||
|
|
|
|||
33
deps.xml
33
deps.xml
|
|
@ -16,19 +16,21 @@
|
|||
<mkdir dir="${target.dir}" />
|
||||
<delete dir="${webinf.dir}/lib" />
|
||||
<mkdir dir="${webinf.dir}/lib" />
|
||||
<delete dir="${webinf.dir}/plugin" />
|
||||
<mkdir dir="${webinf.dir}/plugin" />
|
||||
<delete dir="${crawler.dir}/lib" />
|
||||
<mkdir dir="${crawler.dir}/lib" />
|
||||
<delete dir="${suggest.dir}/lib" />
|
||||
<mkdir dir="${suggest.dir}/lib" />
|
||||
<delete dir="${thumbnail.dir}/lib" />
|
||||
<mkdir dir="${thumbnail.dir}/lib" />
|
||||
<!-- annotation-api -->
|
||||
<!-- javax.annotation-api -->
|
||||
<antcall target="install.env.jar">
|
||||
<param name="repo.url" value="${maven.release.repo.url}" />
|
||||
<param name="jar.groupId" value="jakarta/annotation" />
|
||||
<param name="jar.artifactId" value="jakarta.annotation-api" />
|
||||
<param name="jar.version" value="2.1.1" />
|
||||
<param name="file.version" value="2.1.1" />
|
||||
<param name="jar.groupId" value="javax/annotation" />
|
||||
<param name="jar.artifactId" value="javax.annotation-api" />
|
||||
<param name="jar.version" value="1.3.2" />
|
||||
<param name="file.version" value="1.3.2" />
|
||||
</antcall>
|
||||
<!-- kopf -->
|
||||
<get dest="${target.dir}/kopf.zip">
|
||||
|
|
@ -41,11 +43,14 @@
|
|||
</patternset>
|
||||
<cutdirsmapper dirs="2" />
|
||||
</unzip>
|
||||
<delete>
|
||||
<fileset dir="${webinf.dir}/plugin">
|
||||
<include name="**/*.jar" />
|
||||
</fileset>
|
||||
</delete>
|
||||
<!-- fess-script-groovy -->
|
||||
<antcall target="install.plugin.jar">
|
||||
<param name="repo.url" value="${maven.release.repo.url}" />
|
||||
<param name="jar.groupId" value="org/codelibs/fess" />
|
||||
<param name="jar.artifactId" value="fess-script-groovy" />
|
||||
<param name="jar.version" value="14.17.0" />
|
||||
<param name="file.version" value="14.17.0" />
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="install.env.jar">
|
||||
|
|
@ -59,4 +64,12 @@
|
|||
<copy file="${target.dir}/${jar.artifactId}-${file.version}.jar"
|
||||
todir="${thumbnail.dir}/lib"/>
|
||||
</target>
|
||||
|
||||
<target name="install.plugin.jar">
|
||||
<get dest="${target.dir}">
|
||||
<url url="${repo.url}/${jar.groupId}/${jar.artifactId}/${jar.version}/${jar.artifactId}-${file.version}.jar" />
|
||||
</get>
|
||||
<copy file="${target.dir}/${jar.artifactId}-${file.version}.jar"
|
||||
todir="${webinf.dir}/plugin"/>
|
||||
</target>
|
||||
</project>
|
||||
|
|
|
|||
72
pom.xml
72
pom.xml
|
|
@ -2,7 +2,7 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>fess</artifactId>
|
||||
<version>15.0.0-SNAPSHOT</version>
|
||||
<version>14.18.0</version>
|
||||
<packaging>war</packaging>
|
||||
<name>Fess</name>
|
||||
<description>Fess is Full tExt Search System.</description>
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
<parent>
|
||||
<groupId>org.codelibs.fess</groupId>
|
||||
<artifactId>fess-parent</artifactId>
|
||||
<version>15.0.0-SNAPSHOT</version>
|
||||
<version>14.18.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
<properties>
|
||||
|
|
@ -109,7 +109,6 @@
|
|||
<directory>${project.build.directory}/${project.build.finalName}-compress</directory>
|
||||
</resource>
|
||||
</webResources>
|
||||
<packagingExcludes>**/*.min.map,**/*.min.css.map,**/*.min.js.map</packagingExcludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
@ -945,31 +944,16 @@
|
|||
|
||||
<!-- J2EE -->
|
||||
<dependency>
|
||||
<groupId>jakarta.servlet.jsp.jstl</groupId>
|
||||
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
|
||||
<version>${jakarta.jstl.api.version}</version>
|
||||
<!-- <scope>provided</scope> -->
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>jakarta.el</groupId>
|
||||
<artifactId>jakarta.el-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.web</groupId>
|
||||
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>jstl</artifactId>
|
||||
<version>${jstl.version}</version>
|
||||
<!-- contains taglibs.standard -->
|
||||
<version>${jakarta.jstl.version}</version>
|
||||
<!-- <scope>provided</scope> -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.transaction</groupId>
|
||||
<artifactId>jakarta.transaction-api</artifactId>
|
||||
<version>${jakarta.transaction.api.version}</version>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<artifactId>javax.transaction-api</artifactId>
|
||||
<version>${javax.transaction.api.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.core</groupId>
|
||||
|
|
@ -1335,7 +1319,7 @@
|
|||
<version>${okhttp.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codelibs</groupId>
|
||||
<groupId>com.onelogin</groupId>
|
||||
<artifactId>java-saml</artifactId>
|
||||
<version>${java.saml.version}</version>
|
||||
<exclusions>
|
||||
|
|
@ -1355,11 +1339,6 @@
|
|||
<artifactId>bcprov-jdk18on</artifactId>
|
||||
<version>${bouncycastle.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.esotericsoftware</groupId>
|
||||
<artifactId>kryo</artifactId>
|
||||
<version>${kryo.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- suggest library -->
|
||||
<dependency>
|
||||
|
|
@ -1370,8 +1349,8 @@
|
|||
|
||||
<!-- fileupload -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
<version>${commons.fileupload.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -1446,7 +1425,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codelibs.fess</groupId>
|
||||
<artifactId>fess-crawler-opensearch</artifactId>
|
||||
<artifactId>fess-crawler-es</artifactId>
|
||||
<version>${crawler.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -1532,13 +1511,6 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- groovy -->
|
||||
<dependency>
|
||||
<groupId>org.apache.groovy</groupId>
|
||||
<artifactId>groovy</artifactId>
|
||||
<version>${groovy.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
@ -1573,7 +1545,23 @@
|
|||
<dependency>
|
||||
<groupId>io.rest-assured</groupId>
|
||||
<artifactId>rest-assured</artifactId>
|
||||
<version>5.5.0</version>
|
||||
<version>4.3.2</version>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>jakarta.xml.bind</groupId>
|
||||
<artifactId>jakarta.xml.bind-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.groovy</groupId>
|
||||
<artifactId>groovy</artifactId>
|
||||
<version>${groovy.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import org.apache.catalina.startup.Tomcat;
|
|||
import org.apache.tomcat.util.http.CookieProcessorBase;
|
||||
import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
|
||||
import org.apache.tomcat.util.net.SSLHostConfig;
|
||||
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.tomcat.valve.SuppressErrorReportValve;
|
||||
import org.codelibs.fess.tomcat.webresources.FessWebResourceRoot;
|
||||
|
|
@ -172,16 +171,12 @@ public class FessBoot extends TomcatBoot {
|
|||
connector.setProperty("SSLEnabled", "true");
|
||||
final SSLHostConfig sslHostConfig = new SSLHostConfig();
|
||||
sslHostConfig.setHostName("_default_");
|
||||
final SSLHostConfigCertificate certificate =
|
||||
new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
|
||||
doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> certificate.setCertificateKeystoreFile(v));
|
||||
doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> certificate.setCertificateKeystorePassword(v));
|
||||
doSetupServerConfig(logger, props, "certificateKeyAlias", v -> certificate.setCertificateKeyAlias(v));
|
||||
doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> sslHostConfig.setCertificateKeystoreFile(v));
|
||||
doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> sslHostConfig.setCertificateKeystorePassword(v));
|
||||
doSetupServerConfig(logger, props, "certificateKeyAlias", v -> sslHostConfig.setCertificateKeyAlias(v));
|
||||
doSetupServerConfig(logger, props, "sslProtocol", v -> sslHostConfig.setSslProtocol(v));
|
||||
doSetupServerConfig(logger, props, "enabledProtocols", v -> sslHostConfig.setEnabledProtocols(v.trim().split(",")));
|
||||
sslHostConfig.addCertificate(certificate);
|
||||
connector.addSslHostConfig(sslHostConfig);
|
||||
|
||||
}
|
||||
});
|
||||
doSetupServerConfig(logger, props, "sameSiteCookies", value -> {
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@ import java.io.OutputStreamWriter;
|
|||
import java.io.PrintWriter;
|
||||
import java.util.Locale;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.codelibs.core.exception.IORuntimeException;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.lastaflute.web.util.LaRequestUtil;
|
||||
import org.lastaflute.web.util.LaResponseUtil;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
public abstract class BaseApiManager implements WebApiManager {
|
||||
|
||||
private static final String API_FORMAT_TYPE = "apiFormatType";
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ package org.codelibs.fess.api;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.FilterChain;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
public interface WebApiManager {
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import java.util.ArrayList;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
public class WebApiManagerFactory {
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.api;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequestWrapper;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletRequestWrapper;
|
||||
|
||||
public class WebApiRequest extends HttpServletRequestWrapper {
|
||||
protected String servletPath;
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ package org.codelibs.fess.api;
|
|||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
import org.apache.commons.io.output.ByteArrayOutputStream;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpServletResponseWrapper;
|
||||
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.HttpServletResponseWrapper;
|
||||
import org.apache.commons.io.output.ByteArrayOutputStream;
|
||||
|
||||
public class WebApiResponse extends HttpServletResponseWrapper {
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,14 @@ import java.nio.file.Path;
|
|||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.servlet.FilterChain;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.ServletInputStream;
|
||||
import javax.servlet.ServletOutputStream;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.catalina.connector.ClientAbortException;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
|
@ -41,14 +49,6 @@ import org.codelibs.fess.util.ResourceUtil;
|
|||
import org.lastaflute.web.servlet.request.RequestManager;
|
||||
import org.lastaflute.web.servlet.session.SessionManager;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.ServletInputStream;
|
||||
import jakarta.servlet.ServletOutputStream;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
public class SearchEngineApiManager extends BaseApiManager {
|
||||
private static final String ADMIN_SERVER = "/admin/server_";
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,12 @@ import java.util.Map;
|
|||
import java.util.UUID;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.servlet.FilterChain;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
|
@ -50,6 +56,7 @@ import org.codelibs.fess.entity.PingResponse;
|
|||
import org.codelibs.fess.entity.SearchRenderData;
|
||||
import org.codelibs.fess.entity.SearchRequestParams;
|
||||
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
|
||||
import org.codelibs.fess.es.client.SearchEngineClient;
|
||||
import org.codelibs.fess.exception.InvalidAccessTokenException;
|
||||
import org.codelibs.fess.exception.InvalidQueryException;
|
||||
import org.codelibs.fess.exception.ResultOffsetExceededException;
|
||||
|
|
@ -64,7 +71,6 @@ import org.codelibs.fess.helper.SuggestHelper;
|
|||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.helper.UserInfoHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.client.SearchEngineClient;
|
||||
import org.codelibs.fess.suggest.entity.SuggestItem;
|
||||
import org.codelibs.fess.suggest.request.suggest.SuggestRequestBuilder;
|
||||
import org.codelibs.fess.suggest.request.suggest.SuggestResponse;
|
||||
|
|
@ -77,12 +83,6 @@ import org.lastaflute.web.util.LaRequestUtil;
|
|||
import org.lastaflute.web.util.LaResponseUtil;
|
||||
import org.opensearch.script.Script;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
public class SearchApiManager extends BaseApiManager {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(SearchApiManager.class);
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.job;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
|
|
@ -22,10 +24,10 @@ import org.codelibs.core.timer.TimeoutManager;
|
|||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.logic.AccessContextLogic;
|
||||
import org.codelibs.fess.app.service.ScheduledJobService;
|
||||
import org.codelibs.fess.es.config.exbhv.JobLogBhv;
|
||||
import org.codelibs.fess.helper.JobHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.optional.OptionalThing;
|
||||
import org.lastaflute.core.time.TimeManager;
|
||||
|
|
@ -34,8 +36,6 @@ import org.lastaflute.job.LaJob;
|
|||
import org.lastaflute.job.LaJobRunner;
|
||||
import org.lastaflute.job.LaJobScheduler;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class AllJobScheduler implements LaJobScheduler {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(AllJobScheduler.class);
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ import org.apache.logging.log4j.LogManager;
|
|||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.timer.TimeoutTask;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.es.config.exentity.JobLog;
|
||||
import org.codelibs.fess.es.config.exentity.ScheduledJob;
|
||||
import org.codelibs.fess.exception.ScheduledJobException;
|
||||
import org.codelibs.fess.helper.JobHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.job.JobExecutor;
|
||||
import org.codelibs.fess.opensearch.config.exentity.JobLog;
|
||||
import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.lastaflute.job.JobManager;
|
||||
import org.lastaflute.job.LaJob;
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.logic;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.fess.mylasta.action.FessUserBean;
|
||||
import org.dbflute.hook.AccessContext;
|
||||
import org.dbflute.optional.OptionalThing;
|
||||
import org.lastaflute.core.time.TimeManager;
|
||||
import org.lastaflute.db.dbflute.accesscontext.AccessContextResource;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class AccessContextLogic {
|
||||
|
||||
// ===================================================================================
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@ import java.util.HashSet;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.AccessTokenPager;
|
||||
import org.codelibs.fess.es.config.cbean.AccessTokenCB;
|
||||
import org.codelibs.fess.es.config.exbhv.AccessTokenBhv;
|
||||
import org.codelibs.fess.es.config.exentity.AccessToken;
|
||||
import org.codelibs.fess.exception.InvalidAccessTokenException;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.AccessToken;
|
||||
import org.codelibs.fess.taglib.FessFunctions;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
public class AccessTokenService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -21,17 +21,19 @@ import java.io.Writer;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.BadWordPager;
|
||||
import org.codelibs.fess.es.client.SearchEngineClient;
|
||||
import org.codelibs.fess.es.config.cbean.BadWordCB;
|
||||
import org.codelibs.fess.es.config.exbhv.BadWordBhv;
|
||||
import org.codelibs.fess.es.config.exentity.BadWord;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.client.SearchEngineClient;
|
||||
import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.BadWordBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.BadWord;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.bhv.readable.EntityRowHandler;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
|
|
@ -41,8 +43,6 @@ import com.orangesignal.csv.CsvConfig;
|
|||
import com.orangesignal.csv.CsvReader;
|
||||
import com.orangesignal.csv.CsvWriter;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class BadWordService {
|
||||
|
||||
private static final String DELETE_PREFIX = "--";
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.BoostDocPager;
|
||||
import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
|
||||
import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
|
||||
import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class BoostDocumentRuleService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.CharMappingPager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.mapping.CharMappingItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class CharMappingService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ import java.util.List;
|
|||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.CoreLibConstants;
|
||||
|
|
@ -35,13 +37,13 @@ import org.codelibs.core.beans.util.BeanUtil;
|
|||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.CrawlingInfoPager;
|
||||
import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
|
||||
import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv;
|
||||
import org.codelibs.fess.es.config.exentity.CrawlingInfo;
|
||||
import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
|
||||
import org.codelibs.fess.exception.FessSystemException;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
|
||||
import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.bhv.readable.EntityRowHandler;
|
||||
import org.dbflute.cbean.result.ListResultBean;
|
||||
|
|
@ -52,8 +54,6 @@ import com.orangesignal.csv.CsvConfig;
|
|||
import com.orangesignal.csv.CsvReader;
|
||||
import com.orangesignal.csv.CsvWriter;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class CrawlingInfoService {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(CrawlingInfoService.class);
|
||||
|
|
|
|||
|
|
@ -17,21 +17,21 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.DataConfigPager;
|
||||
import org.codelibs.fess.es.config.cbean.DataConfigCB;
|
||||
import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
|
||||
import org.codelibs.fess.es.config.exentity.DataConfig;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.DataConfig;
|
||||
import org.codelibs.fess.util.ParameterUtil;
|
||||
import org.dbflute.cbean.result.ListResultBean;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class DataConfigService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.DuplicateHostPager;
|
||||
import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
|
||||
import org.codelibs.fess.es.config.exbhv.DuplicateHostBhv;
|
||||
import org.codelibs.fess.es.config.exentity.DuplicateHost;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class DuplicateHostService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -25,22 +25,24 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.ElevateWordPager;
|
||||
import org.codelibs.fess.es.client.SearchEngineClient;
|
||||
import org.codelibs.fess.es.config.cbean.ElevateWordCB;
|
||||
import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.es.config.exentity.ElevateWord;
|
||||
import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
|
||||
import org.codelibs.fess.es.config.exentity.LabelType;
|
||||
import org.codelibs.fess.helper.PermissionHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.client.SearchEngineClient;
|
||||
import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
|
||||
import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
|
||||
import org.codelibs.fess.opensearch.config.exentity.LabelType;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.bhv.readable.EntityRowHandler;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
|
|
@ -50,8 +52,6 @@ import com.orangesignal.csv.CsvConfig;
|
|||
import com.orangesignal.csv.CsvReader;
|
||||
import com.orangesignal.csv.CsvWriter;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class ElevateWordService {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(ElevateWordService.class);
|
||||
|
|
|
|||
|
|
@ -20,25 +20,25 @@ import java.io.PrintWriter;
|
|||
import java.io.StringWriter;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.FailureUrlPager;
|
||||
import org.codelibs.fess.es.config.cbean.FailureUrlCB;
|
||||
import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
|
||||
import org.codelibs.fess.es.config.exentity.CrawlingConfig;
|
||||
import org.codelibs.fess.es.config.exentity.FailureUrl;
|
||||
import org.codelibs.fess.exception.ContainerNotAvailableException;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class FailureUrlService {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(FailureUrlService.class);
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@ import java.util.Collections;
|
|||
import java.util.List;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.es.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.es.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.ListResultBean;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class FavoriteLogService {
|
||||
@Resource
|
||||
protected SystemHelper systemHelper;
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.FileAuthPager;
|
||||
import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
|
||||
import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
|
||||
import org.codelibs.fess.es.config.exentity.FileAuthentication;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
|
||||
import org.codelibs.fess.util.ParameterUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class FileAuthenticationService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.FileConfigPager;
|
||||
import org.codelibs.fess.es.config.cbean.FileConfigCB;
|
||||
import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
|
||||
import org.codelibs.fess.es.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.util.ParameterUtil;
|
||||
import org.dbflute.cbean.result.ListResultBean;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class FileConfigService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@ import static org.codelibs.core.stream.StreamUtil.stream;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.GroupPager;
|
||||
import org.codelibs.fess.es.user.cbean.GroupCB;
|
||||
import org.codelibs.fess.es.user.exbhv.GroupBhv;
|
||||
import org.codelibs.fess.es.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.es.user.exentity.Group;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.user.cbean.GroupCB;
|
||||
import org.codelibs.fess.opensearch.user.exbhv.GroupBhv;
|
||||
import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.opensearch.user.exentity.Group;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class GroupService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.JobLogPager;
|
||||
import org.codelibs.fess.es.config.cbean.JobLogCB;
|
||||
import org.codelibs.fess.es.config.exbhv.JobLogBhv;
|
||||
import org.codelibs.fess.es.config.exentity.JobLog;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.JobLog;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class JobLogService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.KeyMatchPager;
|
||||
import org.codelibs.fess.es.config.cbean.KeyMatchCB;
|
||||
import org.codelibs.fess.es.config.exbhv.KeyMatchBhv;
|
||||
import org.codelibs.fess.es.config.exentity.KeyMatch;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class KeyMatchService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.KuromojiPager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.kuromoji.KuromojiItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class KuromojiService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -17,21 +17,21 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.LabelTypePager;
|
||||
import org.codelibs.fess.es.config.cbean.LabelTypeCB;
|
||||
import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.es.config.exentity.LabelType;
|
||||
import org.codelibs.fess.helper.LabelTypeHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.LabelType;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class LabelTypeService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -18,20 +18,20 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.PathMapPager;
|
||||
import org.codelibs.fess.es.config.cbean.PathMappingCB;
|
||||
import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
|
||||
import org.codelibs.fess.es.config.exentity.PathMapping;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.PathMapping;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class PathMappingService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.ProtwordsPager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.protwords.ProtwordsItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class ProtwordsService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.RelatedContentPager;
|
||||
import org.codelibs.fess.es.config.cbean.RelatedContentCB;
|
||||
import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
|
||||
import org.codelibs.fess.es.config.exentity.RelatedContent;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class RelatedContentService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.RelatedQueryPager;
|
||||
import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
|
||||
import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
|
||||
import org.codelibs.fess.es.config.exentity.RelatedQuery;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class RelatedQueryService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,18 +17,18 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.ReqHeaderPager;
|
||||
import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
|
||||
import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
|
||||
import org.codelibs.fess.es.config.exentity.RequestHeader;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class RequestHeaderService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@ import static org.codelibs.core.stream.StreamUtil.stream;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.RolePager;
|
||||
import org.codelibs.fess.es.user.cbean.RoleCB;
|
||||
import org.codelibs.fess.es.user.exbhv.RoleBhv;
|
||||
import org.codelibs.fess.es.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.es.user.exentity.Role;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.user.cbean.RoleCB;
|
||||
import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
|
||||
import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.opensearch.user.exentity.Role;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class RoleService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,18 +17,18 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.RoleTypePager;
|
||||
import org.codelibs.fess.es.config.cbean.RoleTypeCB;
|
||||
import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
|
||||
import org.codelibs.fess.es.config.exentity.RoleType;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.RoleType;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class RoleTypeService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.SchedulerPager;
|
||||
import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
|
||||
import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
|
||||
import org.codelibs.fess.es.config.exentity.ScheduledJob;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
import org.lastaflute.job.LaCron;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class ScheduledJobService {
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(ScheduledJobService.class);
|
||||
|
|
|
|||
|
|
@ -27,28 +27,30 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.SearchLogPager;
|
||||
import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
|
||||
import org.codelibs.fess.es.log.cbean.ClickLogCB;
|
||||
import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
|
||||
import org.codelibs.fess.es.log.cbean.SearchLogCB;
|
||||
import org.codelibs.fess.es.log.cbean.UserInfoCB;
|
||||
import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.es.log.exentity.ClickLog;
|
||||
import org.codelibs.fess.es.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.es.log.exentity.SearchLog;
|
||||
import org.codelibs.fess.es.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.exception.FessSystemException;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.log.allcommon.EsPagingResultBean;
|
||||
import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
|
||||
import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
|
||||
import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
|
||||
import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.opensearch.log.exentity.ClickLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.SearchLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.taglib.FessFunctions;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
import org.opensearch.search.aggregations.AggregationBuilders;
|
||||
|
|
@ -59,8 +61,6 @@ import org.opensearch.search.aggregations.bucket.terms.Terms;
|
|||
import org.opensearch.search.aggregations.metrics.Avg;
|
||||
import org.opensearch.search.aggregations.metrics.Cardinality;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class SearchLogService {
|
||||
|
||||
private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.StemmerOverridePager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.stemmeroverride.StemmerOverrideItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class StemmerOverrideService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.StopwordsPager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.stopwords.StopwordsItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class StopwordsService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ package org.codelibs.fess.app.service;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.SynonymPager;
|
||||
|
|
@ -28,8 +30,6 @@ import org.codelibs.fess.dict.synonym.SynonymItem;
|
|||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class SynonymService {
|
||||
@Resource
|
||||
protected DictionaryManager dictionaryManager;
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.service;
|
||||
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
|
||||
public class UserInfoService {
|
||||
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.UserPager;
|
||||
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
|
||||
import org.codelibs.fess.es.user.cbean.UserCB;
|
||||
import org.codelibs.fess.es.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.es.user.exentity.User;
|
||||
import org.codelibs.fess.exception.FessUserNotFoundException;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.user.cbean.UserCB;
|
||||
import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
|
||||
import org.codelibs.fess.opensearch.user.exentity.User;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class UserService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.WebAuthPager;
|
||||
import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
|
||||
import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
|
||||
import org.codelibs.fess.es.config.exentity.WebAuthentication;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
|
||||
import org.codelibs.fess.util.ParameterUtil;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class WebAuthenticationService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -17,23 +17,23 @@ package org.codelibs.fess.app.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.pager.WebConfigPager;
|
||||
import org.codelibs.fess.es.config.cbean.WebConfigCB;
|
||||
import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
|
||||
import org.codelibs.fess.es.config.exentity.WebConfig;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
|
||||
import org.codelibs.fess.opensearch.config.exentity.WebConfig;
|
||||
import org.codelibs.fess.util.ParameterUtil;
|
||||
import org.dbflute.cbean.result.ListResultBean;
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
public class WebConfigService extends FessAppService {
|
||||
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import org.codelibs.fess.app.web.admin.design.AdminDesignAction;
|
|||
import org.codelibs.fess.app.web.admin.dict.AdminDictAction;
|
||||
import org.codelibs.fess.app.web.admin.duplicatehost.AdminDuplicatehostAction;
|
||||
import org.codelibs.fess.app.web.admin.elevateword.AdminElevatewordAction;
|
||||
import org.codelibs.fess.app.web.admin.esreq.AdminEsreqAction;
|
||||
import org.codelibs.fess.app.web.admin.failureurl.AdminFailureurlAction;
|
||||
import org.codelibs.fess.app.web.admin.fileauth.AdminFileauthAction;
|
||||
import org.codelibs.fess.app.web.admin.fileconfig.AdminFileconfigAction;
|
||||
|
|
@ -45,7 +46,6 @@ import org.codelibs.fess.app.web.admin.reqheader.AdminReqheaderAction;
|
|||
import org.codelibs.fess.app.web.admin.role.AdminRoleAction;
|
||||
import org.codelibs.fess.app.web.admin.scheduler.AdminSchedulerAction;
|
||||
import org.codelibs.fess.app.web.admin.searchlog.AdminSearchlogAction;
|
||||
import org.codelibs.fess.app.web.admin.sereq.AdminSereqAction;
|
||||
import org.codelibs.fess.app.web.admin.storage.AdminStorageAction;
|
||||
import org.codelibs.fess.app.web.admin.suggest.AdminSuggestAction;
|
||||
import org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction;
|
||||
|
|
@ -142,8 +142,8 @@ public class AdminAction extends FessAdminAction {
|
|||
AdminBackupAction.ROLE + VIEW, //
|
||||
AdminMaintenanceAction.ROLE, //
|
||||
AdminMaintenanceAction.ROLE + VIEW, //
|
||||
AdminSereqAction.ROLE, //
|
||||
AdminSereqAction.ROLE + VIEW, //
|
||||
AdminEsreqAction.ROLE, //
|
||||
AdminEsreqAction.ROLE + VIEW, //
|
||||
AdminDashboardAction.ROLE, //
|
||||
AdminDashboardAction.ROLE + VIEW, //
|
||||
AdminWizardAction.ROLE, //
|
||||
|
|
@ -216,8 +216,8 @@ public class AdminAction extends FessAdminAction {
|
|||
AdminBackupAction.ROLE + VIEW, //
|
||||
AdminMaintenanceAction.ROLE, //
|
||||
AdminMaintenanceAction.ROLE + VIEW, //
|
||||
AdminSereqAction.ROLE, //
|
||||
AdminSereqAction.ROLE + VIEW, //
|
||||
AdminEsreqAction.ROLE, //
|
||||
AdminEsreqAction.ROLE + VIEW, //
|
||||
AdminDashboardAction.ROLE, //
|
||||
AdminDashboardAction.ROLE + VIEW, //
|
||||
AdminWizardAction.ROLE, //
|
||||
|
|
@ -290,8 +290,8 @@ public class AdminAction extends FessAdminAction {
|
|||
AdminBackupAction.ROLE + VIEW, //
|
||||
AdminMaintenanceAction.ROLE, //
|
||||
AdminMaintenanceAction.ROLE + VIEW, //
|
||||
AdminSereqAction.ROLE, //
|
||||
AdminSereqAction.ROLE + VIEW,//
|
||||
AdminEsreqAction.ROLE, //
|
||||
AdminEsreqAction.ROLE + VIEW,//
|
||||
|
||||
})
|
||||
public HtmlResponse index() {
|
||||
|
|
@ -413,8 +413,8 @@ public class AdminAction extends FessAdminAction {
|
|||
if (user.hasRoles(getActionRoles(AdminMaintenanceAction.ROLE))) {
|
||||
return AdminMaintenanceAction.class;
|
||||
}
|
||||
if (user.hasRoles(getActionRoles(AdminSereqAction.ROLE))) {
|
||||
return AdminSereqAction.class;
|
||||
if (user.hasRoles(getActionRoles(AdminEsreqAction.ROLE))) {
|
||||
return AdminEsreqAction.class;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
@ -423,4 +423,4 @@ public class AdminAction extends FessAdminAction {
|
|||
return new String[] { role, role + VIEW };
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -20,6 +20,8 @@ import static org.codelibs.core.stream.StreamUtil.stream;
|
|||
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -30,9 +32,9 @@ import org.codelibs.fess.app.pager.AccessTokenPager;
|
|||
import org.codelibs.fess.app.service.AccessTokenService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.AccessToken;
|
||||
import org.codelibs.fess.helper.PermissionHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.AccessToken;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -42,8 +44,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.accesstoken;
|
||||
|
||||
import javax.validation.constraints.Pattern;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.validation.CustomSize;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
public class CreateForm {
|
||||
|
||||
@ValidateTypeFailure
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.accesstoken;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author jflute
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
|
@ -54,19 +56,19 @@ import org.codelibs.curl.CurlResponse;
|
|||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.annotation.Secured;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
|
||||
import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.es.log.exentity.ClickLog;
|
||||
import org.codelibs.fess.es.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.es.log.exentity.SearchLog;
|
||||
import org.codelibs.fess.es.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
|
||||
import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
|
||||
import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
|
||||
import org.codelibs.fess.opensearch.log.exentity.ClickLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.SearchLog;
|
||||
import org.codelibs.fess.opensearch.log.exentity.UserInfo;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.GsaConfigParser;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
|
|
@ -84,8 +86,6 @@ import org.xml.sax.InputSource;
|
|||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import java.io.Writer;
|
|||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -35,10 +37,10 @@ import org.codelibs.fess.app.pager.BadWordPager;
|
|||
import org.codelibs.fess.app.service.BadWordService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.BadWord;
|
||||
import org.codelibs.fess.exception.FessSystemException;
|
||||
import org.codelibs.fess.helper.SuggestHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.BadWord;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -49,8 +51,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.badword;
|
||||
|
||||
import javax.validation.constraints.Pattern;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.badword;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.boostdoc;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -24,8 +26,8 @@ import org.codelibs.fess.app.pager.BoostDocPager;
|
|||
import org.codelibs.fess.app.service.BoostDocumentRuleService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -35,8 +37,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.boostdoc;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
public class CreateForm {
|
||||
|
||||
@ValidateTypeFailure
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.boostdoc;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author jflute
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.crawlinginfo;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.fess.Constants;
|
||||
|
|
@ -30,8 +32,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Shunji Makino
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.crawlinginfo;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Shunji Makino
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dashboard;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.fess.annotation.Secured;
|
||||
import org.codelibs.fess.api.engine.SearchEngineApiManager;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
|
|
@ -23,8 +25,6 @@ import org.lastaflute.web.Execute;
|
|||
import org.lastaflute.web.response.HtmlResponse;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import java.util.Map;
|
|||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
|
|
@ -36,10 +38,10 @@ import org.codelibs.fess.app.service.RoleTypeService;
|
|||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.ds.DataStoreFactory;
|
||||
import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
|
||||
import org.codelibs.fess.es.config.exentity.DataConfig;
|
||||
import org.codelibs.fess.helper.PermissionHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
|
||||
import org.codelibs.fess.opensearch.config.exentity.DataConfig;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -49,8 +51,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dataconfig;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.validation.CustomSize;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dataconfig;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.design;
|
||||
|
||||
import javax.validation.constraints.Pattern;
|
||||
|
||||
import org.lastaflute.web.ruts.multipart.MultipartFormFile;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
|
||||
public class UploadForm {
|
||||
|
||||
@Required
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.fess.annotation.Secured;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.dict.DictionaryFile;
|
||||
|
|
@ -25,8 +27,6 @@ import org.lastaflute.web.Execute;
|
|||
import org.lastaflute.web.response.HtmlResponse;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ import java.io.File;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -44,8 +46,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
import org.lastaflute.web.validation.exception.ValidationErrorException;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.kuromoji;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ import java.io.InputStream;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -46,8 +48,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
import org.lastaflute.web.validation.exception.ValidationErrorException;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author nullpos
|
||||
* @author ma2tani
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.mapping;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author nullpos
|
||||
* @author ma2tani
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ import java.io.File;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -44,8 +46,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
import org.lastaflute.web.validation.exception.ValidationErrorException;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author ma2tani
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.protwords;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author ma2tani
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ import java.io.File;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -44,8 +46,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
import org.lastaflute.web.validation.exception.ValidationErrorException;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.stemmeroverride;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ import java.io.File;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -42,8 +44,6 @@ import org.lastaflute.web.response.render.RenderData;
|
|||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author ma2tani
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.stopwords;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author ma2tani
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ import java.io.InputStream;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -46,8 +48,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
import org.lastaflute.web.validation.VaErrorHook;
|
||||
import org.lastaflute.web.validation.exception.ValidationErrorException;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.dict.synonym;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.duplicatehost;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.fess.Constants;
|
||||
|
|
@ -23,8 +25,8 @@ import org.codelibs.fess.app.pager.DuplicateHostPager;
|
|||
import org.codelibs.fess.app.service.DuplicateHostService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.DuplicateHost;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -34,8 +36,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.duplicatehost;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.duplicatehost;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ import java.nio.file.Path;
|
|||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -42,11 +44,11 @@ import org.codelibs.fess.app.service.ElevateWordService;
|
|||
import org.codelibs.fess.app.service.LabelTypeService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.ElevateWord;
|
||||
import org.codelibs.fess.exception.FessSystemException;
|
||||
import org.codelibs.fess.helper.PermissionHelper;
|
||||
import org.codelibs.fess.helper.SuggestHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -57,8 +59,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.elevateword;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.validation.CustomSize;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.elevateword;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* either express or implied. See the License for the specific language
|
||||
* governing permissions and limitations under the License.
|
||||
*/
|
||||
package org.codelibs.fess.app.web.admin.sereq;
|
||||
package org.codelibs.fess.app.web.admin.esreq;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
|
|
@ -42,16 +42,16 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
|
|||
/**
|
||||
* @author shinsuke
|
||||
*/
|
||||
public class AdminSereqAction extends FessAdminAction {
|
||||
public class AdminEsreqAction extends FessAdminAction {
|
||||
|
||||
public static final String ROLE = "admin-sereq";
|
||||
public static final String ROLE = "admin-esreq";
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(AdminSereqAction.class);
|
||||
private static final Logger logger = LogManager.getLogger(AdminEsreqAction.class);
|
||||
|
||||
@Override
|
||||
protected void setupHtmlData(final ActionRuntime runtime) {
|
||||
super.setupHtmlData(runtime);
|
||||
runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameSereq()));
|
||||
runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameEsreq()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -95,7 +95,7 @@ public class AdminSereqAction extends FessAdminAction {
|
|||
throwValidationError(messages -> messages.addErrorsInvalidHeaderForRequestFile(GLOBAL, msg), () -> asListHtml(this::saveToken));
|
||||
} else {
|
||||
try (final CurlResponse response = curlRequest.body(buf.toString()).execute()) {
|
||||
final File tempFile = ComponentUtil.getSystemHelper().createTempFile("sereq_", ".json");
|
||||
final File tempFile = ComponentUtil.getSystemHelper().createTempFile("esreq_", ".json");
|
||||
try (final InputStream in = response.getContentAsStream()) {
|
||||
CopyUtil.copy(in, tempFile);
|
||||
} catch (final Exception e1) {
|
||||
|
|
@ -160,7 +160,7 @@ public class AdminSereqAction extends FessAdminAction {
|
|||
if (runnable != null) {
|
||||
runnable.run();
|
||||
}
|
||||
return asHtml(path_AdminSereq_AdminSereqJsp).useForm(UploadForm.class);
|
||||
return asHtml(path_AdminEsreq_AdminEsreqJsp).useForm(UploadForm.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
* either express or implied. See the License for the specific language
|
||||
* governing permissions and limitations under the License.
|
||||
*/
|
||||
package org.codelibs.fess.app.web.admin.sereq;
|
||||
package org.codelibs.fess.app.web.admin.esreq;
|
||||
|
||||
import org.lastaflute.web.ruts.multipart.MultipartFormFile;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
|
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.failureurl;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.annotation.Secured;
|
||||
import org.codelibs.fess.app.pager.FailureUrlPager;
|
||||
|
|
@ -27,8 +29,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.failureurl;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.fess.Constants;
|
||||
|
|
@ -30,9 +32,9 @@ import org.codelibs.fess.app.service.FileAuthenticationService;
|
|||
import org.codelibs.fess.app.service.FileConfigService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.FileAuthentication;
|
||||
import org.codelibs.fess.es.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -42,8 +44,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.fileauth;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.fileauth;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ import static org.codelibs.core.stream.StreamUtil.stream;
|
|||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.lang.StringUtil;
|
||||
|
|
@ -32,10 +34,10 @@ import org.codelibs.fess.app.service.LabelTypeService;
|
|||
import org.codelibs.fess.app.service.RoleTypeService;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.app.web.base.FessAdminAction;
|
||||
import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
|
||||
import org.codelibs.fess.es.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.helper.PermissionHelper;
|
||||
import org.codelibs.fess.helper.SystemHelper;
|
||||
import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
|
||||
import org.codelibs.fess.opensearch.config.exentity.FileConfig;
|
||||
import org.codelibs.fess.util.ComponentUtil;
|
||||
import org.codelibs.fess.util.RenderDataUtil;
|
||||
import org.dbflute.optional.OptionalEntity;
|
||||
|
|
@ -45,8 +47,6 @@ import org.lastaflute.web.response.HtmlResponse;
|
|||
import org.lastaflute.web.response.render.RenderData;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.fileconfig;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.codelibs.fess.Constants;
|
||||
import org.codelibs.fess.app.web.CrudMode;
|
||||
import org.codelibs.fess.mylasta.direction.FessConfig;
|
||||
|
|
@ -25,10 +29,6 @@ import org.codelibs.fess.validation.UriTypeValidator.ProtocolType;
|
|||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author codelibs
|
||||
* @author Keiichi Watanabe
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.fileconfig;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author Keiichi Watanabe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.codelibs.core.beans.util.BeanUtil;
|
||||
|
|
@ -39,8 +41,6 @@ import org.lastaflute.web.Execute;
|
|||
import org.lastaflute.web.response.HtmlResponse;
|
||||
import org.lastaflute.web.ruts.process.ActionRuntime;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Shunji Makino
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
*/
|
||||
package org.codelibs.fess.app.web.admin.general;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
import org.lastaflute.web.validation.Required;
|
||||
import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @author shinsuke
|
||||
* @author Shunji Makino
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue