Skip to content

Commit

Permalink
Optimizing hierarchical cache management into FormsOnline
Browse files Browse the repository at this point in the history
  • Loading branch information
@SilverYoCha
SilverYoCha committed Mar 31, 2023
1 parent 9f3d556 commit df4d822
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 31 deletions.
79 changes: 49 additions & 30 deletions .../src/main/java/org/silverpeas/components/formsonline/model/DefaultFormsOnlineService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,17 @@
import org.silverpeas.components.formsonline.notification.FormsOnlineCanceledRequestUserNotification;
import org.silverpeas.components.formsonline.notification.FormsOnlinePendingValidationRequestUserNotification;
import org.silverpeas.components.formsonline.notification.FormsOnlineProcessedRequestFollowingUserNotification;

import org.silverpeas.components.formsonline.notification
.FormsOnlineProcessedRequestOtherValidatorsUserNotification;
import org.silverpeas.components.formsonline.notification.FormsOnlineProcessedRequestOtherValidatorsUserNotification;
import org.silverpeas.components.formsonline.notification.FormsOnlineProcessedRequestUserNotification;
import org.silverpeas.components.formsonline.notification.FormsOnlineValidationRequestUserNotification;
import org.silverpeas.core.admin.PaginationPage;
import org.silverpeas.core.admin.service.OrganizationController;
import org.silverpeas.core.admin.user.model.Group;
import org.silverpeas.core.admin.user.model.User;
import org.silverpeas.core.admin.user.model.UserDetail;
import org.silverpeas.core.annotation.Service;
import org.silverpeas.core.admin.user.model.UserFull;
import org.silverpeas.core.annotation.Service;
import org.silverpeas.core.cache.service.CacheServiceProvider;
import org.silverpeas.core.contribution.ContributionStatus;
import org.silverpeas.core.contribution.attachment.AttachmentServiceProvider;
import org.silverpeas.core.contribution.attachment.model.SimpleDocument;
Expand Down Expand Up @@ -88,22 +87,15 @@
import javax.mail.internet.MimeMultipart;
import javax.transaction.Transactional;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static java.text.MessageFormat.format;
import static java.util.Collections.emptyList;
import static java.util.Optional.ofNullable;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.toSet;
import static org.silverpeas.components.formsonline.model.FormDetail.*;
import static org.silverpeas.components.formsonline.model.FormInstanceValidationType.HIERARCHICAL;
Expand All @@ -113,6 +105,7 @@
import static org.silverpeas.core.mail.MailContent.getHtmlBodyPartFromHtmlContent;
import static org.silverpeas.core.notification.user.builder.helper.UserNotificationHelper.buildAndSend;
import static org.silverpeas.core.util.CollectionUtil.isEmpty;
import static org.silverpeas.core.util.StringUtil.EMPTY;
import static org.silverpeas.core.util.StringUtil.isNotDefined;

@Service
Expand Down Expand Up @@ -226,8 +219,8 @@ public FormDetail saveForm(FormDetail form,
.map(Map.Entry::getValue)
.anyMatch(p -> p.getFirst().isEmpty() && p.getSecond().isEmpty()))
.isPresent()) {
throw new FormsOnlineException(
format("published form {0} must have final validators", form.getPK()));
throw new FormsOnlineException(
format("published form {0} must have final validators", form.getPK()));
}
}
if (theForm.getId() == -1) {
Expand Down Expand Up @@ -322,11 +315,11 @@ public RequestsByStatus getAllUserRequests(String appId, String userId,
getDAO().getSentFormInstances(form.getPK(), userId, states, paginationPage);
//noinspection SimplifyStreamApiCallChains
merge.accept(requests, result.stream()
.map(l -> {
l.setForm(form);
return l;
})
.collect(SilverpeasList.collector(result)));
.map(l -> {
l.setForm(form);
return l;
})
.collect(SilverpeasList.collector(result)));
}
}
return requests;
Expand All @@ -345,7 +338,7 @@ public RequestsByStatus getValidatorRequests(RequestsFilter filter, String valid
final String userDomainId = User.getById(validatorId).getDomainId();
final User[] users = OrganizationController.get().getAllUsersInDomain(userDomainId);
final Set<String> userIds = Stream.of(users).map(User::getId).collect(toSet());
final HierarchicalValidatorCacheManager hvManager = new HierarchicalValidatorCacheManager();
final HierarchicalValidatorCacheManager hvManager = HierarchicalValidatorCacheManager.get();
hvManager.cacheHierarchicalValidatorsOf(userIds);
return userIds.stream()
.map(u -> Pair.of(u, hvManager.getHierarchicalValidatorOf(u)))
Expand Down Expand Up @@ -380,7 +373,7 @@ public RequestsByStatus getValidatorRequests(RequestsFilter filter, String valid
final Optional<FormInstanceValidationType> pendingValidationTypeFilter = filter
.getPendingValidationType();
final SilverpeasList<FormInstance> result = getDAO().getReceivedRequests(form, states, validationCriteria,
ofNullable(paginationPage).filter(p -> pendingValidationTypeFilter.isEmpty()).orElse(null));
ofNullable(paginationPage).filter(p -> pendingValidationTypeFilter.isEmpty()).orElse(null));
@SuppressWarnings("SimplifyStreamApiCallChains")
Stream<FormInstance> resultStream = result.stream().map(l -> {
l.setForm(form);
Expand Down Expand Up @@ -410,7 +403,7 @@ private Stream<FormInstance> filterOnValidationType(Stream<FormInstance> resultS
.reduce((a, b) -> b);
return previousType
.map(p ->r.getValidations().getValidationOfType(p).filter(FormInstanceValidation::isValidated).isPresent()
&& r.getValidations().getValidationOfType(type).isEmpty())
&& r.getValidations().getValidationOfType(type).isEmpty())
.orElseGet(() -> r.getValidations().isEmpty());
});
}
Expand All @@ -425,7 +418,7 @@ public Map<String, Set<FormInstanceValidationType>> getValidatorFormIdsWithValid
.getValidatorFormIdsWithValidationTypes(appId, validatorId, userGroupIds, formIds);
// get available form as boss
final List<FormDetail> forms = getDAO().findAllForms(appId);
final HierarchicalValidatorCacheManager hvManager = new HierarchicalValidatorCacheManager();
final HierarchicalValidatorCacheManager hvManager = HierarchicalValidatorCacheManager.get();
for (FormDetail form : forms) {
if (form.isHierarchicalValidation() && (isEmpty(formIds) || formIds.contains(form.getPK().getId()))) {
final SilverpeasList<FormInstance> requests = getDAO().getAllRequests(form.getPK());
Expand All @@ -437,7 +430,7 @@ public Map<String, Set<FormInstanceValidationType>> getValidatorFormIdsWithValid
.findFirst()
.ifPresent(b ->
result.computeIfAbsent(Integer.toString(form.getId()), s -> new TreeSet<>())
.add(HIERARCHICAL));
.add(HIERARCHICAL));
}
}
return result;
Expand Down Expand Up @@ -915,7 +908,7 @@ private void removeIndex(FormPK pk) {
}

private IndexEntryKey getIndexEntryKey(FormPK pk) {
return new IndexEntryKey(pk.getInstanceId(), "FormOnline", pk.getId());
return new IndexEntryKey(pk.getInstanceId(), "FormOnline", pk.getId());
}

public void index(String componentId) {
Expand Down Expand Up @@ -943,17 +936,33 @@ private void setSendersAndReceivers(FormDetail form) throws FormsOnlineException

/**
* Permits to manage a cache in order to increase performances.
* <p>
* This cache is thread scoped.
* </p>
*/
public static class HierarchicalValidatorCacheManager {

private static final String CACHE_KEY = HierarchicalValidatorCacheManager.class.getName();
private final Set<String> userIds = new HashSet<>();
private final Map<String, String> cache = new HashMap<>();

public static HierarchicalValidatorCacheManager get() {
return CacheServiceProvider.getThreadCacheService()
.getCache()
.computeIfAbsent(CACHE_KEY, HierarchicalValidatorCacheManager.class,
HierarchicalValidatorCacheManager::new);
}

private HierarchicalValidatorCacheManager() {
// hidden constructor
}

/**
* Caches the hierarchical validators of users represented by given ids.
* @param userIds set of string user ids.
*/
public void cacheHierarchicalValidatorsOf(final Set<String> userIds) {
userIds.forEach(this::getHierarchicalValidatorOf);
userIds.stream().filter(not(cache::containsKey)).forEach(this.userIds::add);
}

/**
Expand All @@ -965,9 +974,19 @@ public void cacheHierarchicalValidatorsOf(final Set<String> userIds) {
* @return the hierarchical validator of the user represented by the given id.
*/
public String getHierarchicalValidatorOf(final String userId) {
return cache.computeIfAbsent(userId, i -> ofNullable(UserFull.getById(i))
.map(u -> u.getValue("boss"))
.orElse(StringUtil.EMPTY));
if (!userIds.isEmpty()) {
UserFull.getByIds(userIds).forEach(u -> {
final String id = u.getId();
userIds.remove(id);
cache.put(id, ofNullable(u.getValue("boss")).orElse(EMPTY));
});
userIds.forEach(i -> cache.put(i, EMPTY));
userIds.clear();
}
return cache.computeIfAbsent(userId,
i -> ofNullable(UserFull.getById(i))
.map(u -> u.getValue("boss"))
.orElse(StringUtil.EMPTY));
}
}
}
2 changes: 1 addition & 1 deletion ...sOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormDetail.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public String getHierarchicalValidatorOfCurrentUser() {

HierarchicalValidatorCacheManager getHvManager() {
if (hvManager == null) {
hvManager = new HierarchicalValidatorCacheManager();
hvManager = HierarchicalValidatorCacheManager.get();
}
return hvManager;
}
Expand Down

0 comments on commit df4d822

Please sign in to comment.