chore: bump boostrap to 3.2.0

Author: fdaugan

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.ligoj.api</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.1.12</version>
+        <version>4.1.13</version>
         <relativePath/>
     </parent>
 

src/main/java/org/ligoj/app/plugin/id/model/AbstractNameComparator.java

@@ -27,8 +27,8 @@ public abstract class AbstractNameComparator extends LoginComparator {
 	 *         second.
 	 */
 	protected int compare(final UserOrg o1, final UserOrg o2, final Function<UserOrg, String> nameProvider) {
-		final var compareTo = ObjectUtils.defaultIfNull(nameProvider.apply(o1), "")
-				.compareToIgnoreCase(ObjectUtils.defaultIfNull(nameProvider.apply(o2), ""));
+		final var compareTo = ObjectUtils.getIfNull(nameProvider.apply(o1), "")
+				.compareToIgnoreCase(ObjectUtils.getIfNull(nameProvider.apply(o2), ""));
 		if (compareTo == 0) {
 			// Equals, so compare with the identifier
 			return super.compare(o1, o2);

src/main/java/org/ligoj/app/plugin/id/model/PasswordResetAudit.java

@@ -3,24 +3,19 @@
  */
 package org.ligoj.app.plugin.id.model;
 
-import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotBlank;
-
+import lombok.Getter;
+import lombok.Setter;
 import org.ligoj.bootstrap.core.model.AbstractPersistable;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonProperty.Access;
-
-import lombok.Getter;
-import lombok.Setter;
+import java.time.Instant;
 
 /**
  * Password reset audit entity.
@@ -41,11 +36,10 @@ public class PasswordResetAudit extends AbstractPersistable<Integer> {
 	/**
 	 * Created date will never be updated.
 	 */
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(updatable = false)
 	@JsonProperty(access = Access.READ_ONLY)
 	@CreatedDate
-	private Date createdDate;
+	private Instant createdDate;
 
 	/**
 	 * Related username/login/UID.

src/main/java/org/ligoj/app/plugin/id/resource/CompanyResource.java

@@ -68,7 +68,7 @@ public CompanyOrg getUserCompany() {
 		if (user == null) {
 			return null;
 		}
-		return getRepository().findById(ObjectUtils.defaultIfNull(user.getCompany(), ""));
+		return getRepository().findById(ObjectUtils.getIfNull(user.getCompany(), ""));
 	}
 
 	/**
@@ -90,8 +90,8 @@ private String getUserCompanyDn() {
 	 * @return <code>true</code> when the current user is inside the internal scope of people.
 	 */
 	public boolean isUserInternalCompany() {
-		return ObjectUtils.defaultIfNull(getUserCompanyDn(), "")
-				.endsWith(ObjectUtils.defaultIfNull(getUserRepository().getPeopleInternalBaseDn(), ""));
+		return ObjectUtils.getIfNull(getUserCompanyDn(), "")
+				.endsWith(ObjectUtils.getIfNull(getUserRepository().getPeopleInternalBaseDn(), ""));
 	}
 
 	/**

src/main/java/org/ligoj/app/plugin/id/resource/UserOrgResource.java

@@ -12,6 +12,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.text.WordUtils;
 import org.apache.cxf.jaxrs.impl.UriInfoImpl;
 import org.apache.cxf.message.Message;
@@ -550,7 +551,7 @@ private boolean hasAttributeChange(final SimpleUser importEntry, boolean hasChan
 	 */
 	@SafeVarargs
 	private boolean hasAttributeChange(final SimpleUser user1, final SimpleUser user2, final Function<SimpleUser, String>... equals) {
-		final var predicateFalse = Arrays.stream(equals).filter(f -> !StringUtils.equalsIgnoreCase(StringUtils.trimToNull(f.apply(user2)), StringUtils.trimToNull(f.apply(user1)))).findFirst().orElse(null);
+		final var predicateFalse = Arrays.stream(equals).filter(f -> !Strings.CI.equals(StringUtils.trimToNull(f.apply(user2)), StringUtils.trimToNull(f.apply(user1)))).findFirst().orElse(null);
 		return predicateFalse != null && hasAttributeChange(user1, true, String.format("'%s' != '%s'", predicateFalse.apply(user1), predicateFalse.apply(user2)));
 	}
 
@@ -989,7 +990,7 @@ public void decorate(final SessionSettings settings) {
 	public Collection<GrantedAuthority> getGrantedAuthorities(final String username) {
 		try {
 			// Check if the user lock status without using cache
-			final var rawUserOrg = getUserRepository().findById(Normalizer.normalize(username));
+			final var rawUserOrg = getUserRepository().toUser(Normalizer.normalize(username));
 			final var roles = new ArrayList<GrantedAuthority>();
 			for (String group : rawUserOrg.getGroups()) {
 				roles.add(new SimpleGrantedAuthority(group.toUpperCase()));

src/main/java/org/ligoj/app/plugin/id/resource/batch/AbstractBatchResource.java

@@ -153,7 +153,7 @@ protected <T extends AbstractBatchTask<B>> long batchInternal(final InputStream
 				+ "\n";
 
 		// Build entries with prepended CSV header
-		final var encSafe = ObjectUtils.defaultIfNull(encoding, StandardCharsets.UTF_8.name());
+		final var encSafe = ObjectUtils.getIfNull(encoding, StandardCharsets.UTF_8.name());
 		final var input = new ByteArrayInputStream(csvHeaders.getBytes(encSafe));
 		final var entries = csvForBean.toBean(batchType,
 				new InputStreamReader(new SequenceInputStream(input, uploadedFile), encSafe));

src/test/java/org/ligoj/app/plugin/id/model/CompanyComparatorTest.java

@@ -16,7 +16,7 @@ class CompanyComparatorTest {
 	private UserOrg newSimpleUser(final String company, final String login) {
 		final UserOrg simpleUser = new UserOrg();
 		simpleUser.setCompany(company);
-		simpleUser.setName(ObjectUtils.defaultIfNull(login, "l"));
+		simpleUser.setName(ObjectUtils.getIfNull(login, "l"));
 		return simpleUser;
 	}
 

src/test/java/org/ligoj/app/plugin/id/model/FirstNameComparatorTest.java

@@ -16,7 +16,7 @@ class FirstNameComparatorTest {
 	private UserOrg newSimpleUser(final String firstName, final String login) {
 		final UserOrg simpleUser = new UserOrg();
 		simpleUser.setFirstName(firstName);
-		simpleUser.setName(ObjectUtils.defaultIfNull(login, "l"));
+		simpleUser.setName(ObjectUtils.getIfNull(login, "l"));
 		return simpleUser;
 	}
 

src/test/java/org/ligoj/app/plugin/id/model/LastNameComparatorTest.java

@@ -16,7 +16,7 @@ class LastNameComparatorTest {
 	private UserOrg newSimpleUser(final String lastName, final String login) {
 		final UserOrg simpleUser = new UserOrg();
 		simpleUser.setLastName(lastName);
-		simpleUser.setName(ObjectUtils.defaultIfNull(login, "l"));
+		simpleUser.setName(ObjectUtils.getIfNull(login, "l"));
 		return simpleUser;
 	}
 

src/test/java/org/ligoj/app/plugin/id/model/MailComparatorTest.java

@@ -19,7 +19,7 @@ class MailComparatorTest {
 	private UserOrg newSimpleUser(final String firstName, final String login) {
 		final UserOrg simpleUser = new UserOrg();
 		simpleUser.setMails(firstName == null ? new ArrayList<>() : Collections.singletonList(firstName));
-		simpleUser.setName(ObjectUtils.defaultIfNull(login, "l"));
+		simpleUser.setName(ObjectUtils.getIfNull(login, "l"));
 		return simpleUser;
 	}