0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-05-04 06:46:09 +09:00
parent 0e322bd8a2
commit bfcde3f28e
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -32,3 +32,5 @@ dbflute_fess/schema/project-lastadoc-fess.json
src/main/resources/fess_indices/.fess_config.access_token/access_token.bulk
src/main/resources/ga_client_secrets.p12
src/main/webapp/WEB-INF/project.properties
/.apt_generated/
/.apt_generated_tests/

3
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
View file

@ -46,7 +46,6 @@ import org.codelibs.core.CoreLibConstants;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.api.BaseApiManager;
import org.codelibs.fess.api.WebApiManager;
import org.codelibs.fess.api.WebApiRequest;
import org.codelibs.fess.entity.FacetInfo;
import org.codelibs.fess.entity.GeoInfo;
@ -60,7 +59,7 @@ import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
import org.dbflute.optional.OptionalThing;
public class GsaApiManager extends BaseApiManager implements WebApiManager {
public class GsaApiManager extends BaseApiManager {
private static final Logger logger = LogManager.getLogger(GsaApiManager.class);
private static final String OUTPUT_XML = "xml"; // or xml_no_dtd

2
src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
View file

@ -98,7 +98,7 @@ public class ScriptExecutorJob implements LaJob {
logger.info("Starting Job {}.", id);
}
final Object ret = jobExecutor.execute(script);
final Object ret = jobExecutor.execute(Constants.DEFAULT_SCRIPT, script);
if (ret == null) {
if (scheduledJob.isLoggingEnabled() && logger.isInfoEnabled()) {
logger.info("Finished Job {}.", id);

6
src/main/java/org/codelibs/fess/dict/DictionaryManager.java
View file

@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.FileUtil;
import org.codelibs.curl.CurlResponse;
import org.codelibs.fesen.runner.net.EcrCurl;
import org.codelibs.fesen.runner.net.FesenCurl;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
@ -52,7 +52,7 @@ public class DictionaryManager {
public DictionaryFile<? extends DictionaryItem>[] getDictionaryFiles() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
.param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
@SuppressWarnings("unchecked")
final List<Map<String, Object>> fileList = (List<Map<String, Object>>) contentMap.get("file");
return fileList.stream().map(fileMap -> {
@ -94,7 +94,7 @@ public class DictionaryManager {
// TODO use stream
try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
.body(FileUtil.readUTF8(file)).execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
throw new DictionaryException("Failed to update " + dictFile.getPath());
}

8
src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
View file

@ -47,7 +47,7 @@ import org.codelibs.core.net.UuidUtil;
import org.codelibs.core.stream.StreamUtil;
import org.codelibs.curl.Curl;
import org.codelibs.curl.CurlResponse;
import org.codelibs.fesen.runner.net.EcrCurl;
import org.codelibs.fesen.runner.net.FesenCurl;
import org.codelibs.fess.app.web.base.login.ActionResponseCredential;
import org.codelibs.fess.app.web.base.login.AzureAdCredential;
import org.codelibs.fess.app.web.base.login.AzureAdCredential.AzureAdUser;
@ -369,7 +369,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
}
try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}
@ -449,7 +449,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").header("Content-type", "application/json")
.body("{\"securityEnabledOnly\":false}").execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}
@ -487,7 +487,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
}
try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}