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 2020-12-05 22:24:57 +09:00
parent d220415a15
commit ba32693ff3
9 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
View file

@ -51,7 +51,6 @@ public class FavoriteLogService {
favoriteLogBhv.insert(favoriteLog);
if (fessConfig.isLoggingSearchUseLogfile()) {
ComponentUtil.getSearchLogHelper().writeSearchLogEvent(favoriteLog);
;
}
return true;
}).orElse(false);

8
src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
View file

@ -145,10 +145,10 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
counter++;
localDataMap.put(fessConfig.getIndexFieldUrl(), processingUrl);
}
} catch (ChildUrlsException e) {
} catch (final ChildUrlsException e) {
e.getChildUrlList().stream().map(RequestData::getUrl).forEach(urlQueue::offer);
} catch (DataStoreCrawlingException e) {
Throwable cause = e.getCause();
} catch (final DataStoreCrawlingException e) {
final Throwable cause = e.getCause();
if (cause instanceof ChildUrlsException) {
((ChildUrlsException) cause).getChildUrlList().stream().map(RequestData::getUrl).forEach(urlQueue::offer);
} else {
@ -172,7 +172,7 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
}
try {
return Long.parseLong(recursive.toString());
} catch (NumberFormatException e) {
} catch (final NumberFormatException e) {
return 1L;
}
}

2
src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
View file

@ -33,6 +33,7 @@ public class ClickLog extends BsClickLog implements SearchLogEvent {
private Map<String, Object> fields;
@Override
public String getId() {
return asDocMeta().id();
}
@ -41,6 +42,7 @@ public class ClickLog extends BsClickLog implements SearchLogEvent {
asDocMeta().id(id);
}
@Override
public Long getVersionNo() {
return asDocMeta().version();
}

2
src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
View file

@ -33,6 +33,7 @@ public class FavoriteLog extends BsFavoriteLog implements SearchLogEvent {
private Map<String, Object> fields;
@Override
public String getId() {
return asDocMeta().id();
}
@ -41,6 +42,7 @@ public class FavoriteLog extends BsFavoriteLog implements SearchLogEvent {
asDocMeta().id(id);
}
@Override
public Long getVersionNo() {
return asDocMeta().version();
}

2
src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
View file

@ -49,6 +49,7 @@ public class SearchLog extends BsSearchLog implements SearchLogEvent {
private final List<Map<String, Object>> documentList = new ArrayList<>();
@Override
public String getId() {
return asDocMeta().id();
}
@ -57,6 +58,7 @@ public class SearchLog extends BsSearchLog implements SearchLogEvent {
asDocMeta().id(id);
}
@Override
public Long getVersionNo() {
return asDocMeta().version();
}

2
src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
View file

@ -33,6 +33,7 @@ public class UserInfo extends BsUserInfo implements SearchLogEvent {
private Map<String, Object> fields;
@Override
public String getId() {
return asDocMeta().id();
}
@ -41,6 +42,7 @@ public class UserInfo extends BsUserInfo implements SearchLogEvent {
asDocMeta().id(id);
}
@Override
public Long getVersionNo() {
return asDocMeta().version();
}

4
src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java
View file

@ -276,8 +276,8 @@ public class CrawlingConfigHelper {
return urlList;
}
public OptionalEntity<CrawlingConfig> getDefaultConfig(ConfigType configType) {
String name = ComponentUtil.getFessConfig().getFormAdminDefaultTemplateName();
public OptionalEntity<CrawlingConfig> getDefaultConfig(final ConfigType configType) {
final String name = ComponentUtil.getFessConfig().getFormAdminDefaultTemplateName();
switch (configType) {
case WEB:

4
src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java
View file

@ -259,7 +259,7 @@ public class RoleQueryHelper {
}
return;
}
} catch (NumberFormatException e) {
} catch (final NumberFormatException e) {
logger.warn("Invalid role info: {}", rolesStr, e);
return;
}
@ -329,7 +329,7 @@ public class RoleQueryHelper {
this.encryptedCookieValue = encryptedCookieValue;
}
public void setMaxAge(long maxAge) {
public void setMaxAge(final long maxAge) {
this.maxAge = maxAge;
}

10
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
View file

@ -415,16 +415,16 @@ public class SearchLogHelper {
}
}
public void writeSearchLogEvent(SearchLogEvent event) {
public void writeSearchLogEvent(final SearchLogEvent event) {
try {
final Map<String, Object> source = toSource(event);
searchLogLogger.info(objectMapper.writeValueAsString(source));
} catch (JsonProcessingException e) {
} catch (final JsonProcessingException e) {
logger.warn("Failed to write {}", event, e);
}
}
protected Map<String, Object> toSource(SearchLogEvent searchLogEvent) {
protected Map<String, Object> toSource(final SearchLogEvent searchLogEvent) {
final Map<String, Object> source = toLowerHyphen(searchLogEvent.toSource());
source.put("_id", searchLogEvent.getId());
// source.put("version_no", searchLogEvent.getVersionNo());
@ -432,7 +432,7 @@ public class SearchLogHelper {
return source;
}
protected Map<String, Object> toLowerHyphen(Map<String, Object> source) {
protected Map<String, Object> toLowerHyphen(final Map<String, Object> source) {
return source.entrySet().stream()
.collect(Collectors.toMap(e -> CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, e.getKey()), e -> {
final Object value = e.getValue();
@ -453,7 +453,7 @@ public class SearchLogHelper {
this.userInfoCacheSize = userInfoCacheSize;
}
public void setLoggerName(String loggerName) {
public void setLoggerName(final String loggerName) {
this.loggerName = loggerName;
}
}