chore: bump plugin-api to 4.1.13

fdaugan · fdaugan · commit 5f50aad446b9 · 2025-08-26T23:40:01.000+02:00
diff --git a/pom.xml b/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>
 
diff --git a/src/main/java/org/ligoj/app/plugin/prov/AbstractProvQuoteInstanceOsResource.java b/src/main/java/org/ligoj/app/plugin/prov/AbstractProvQuoteInstanceOsResource.java
@@ -63,7 +63,7 @@ protected boolean canByol(final VmOs os) {
 
 	@Override
 	protected void saveOrUpdateSpec(final C entity, final E vo) {
-		entity.setOs(ObjectUtils.defaultIfNull(vo.getOs(), entity.getPrice().getOs()));
+		entity.setOs(ObjectUtils.getIfNull(vo.getOs(), entity.getPrice().getOs()));
 		entity.setEphemeral(vo.isEphemeral());
 		entity.setMaxVariableCost(vo.getMaxVariableCost());
 		entity.setInternet(vo.getInternet());
diff --git a/src/main/java/org/ligoj/app/plugin/prov/AbstractProvQuoteVmResource.java b/src/main/java/org/ligoj/app/plugin/prov/AbstractProvQuoteVmResource.java
@@ -295,7 +295,7 @@ protected ProvOptimizer getOptimizer(final ProvQuote configuration, final String
 	private <G extends INamableBean<?>> G getProfileByName(final G quoteProfile, final String name, List<G> allProfiles,
 			G defaultProfile) {
 		if (name == null) {
-			return ObjectUtils.defaultIfNull(quoteProfile, defaultProfile);
+			return ObjectUtils.getIfNull(quoteProfile, defaultProfile);
 		}
 		return allProfiles.stream().filter(u -> u.getName().equals(name)).findFirst()
 				.orElseThrow(() -> new EntityNotFoundException(name));
@@ -309,7 +309,7 @@ private <G extends INamableBean<?>> G getProfileByName(final G quoteProfile, fin
 	 * @return The resolved processor requirement. May be <code>null</code>.
 	 */
 	protected String getProcessor(final ProvQuote configuration, final String processor) {
-		return ObjectUtils.defaultIfNull(processor, ObjectUtils.defaultIfNull(configuration.getProcessor(), ""));
+		return ObjectUtils.getIfNull(processor, ObjectUtils.getIfNull(configuration.getProcessor(), ""));
 	}
 
 	/**
@@ -343,7 +343,7 @@ protected double getCpu(final ProvQuote configuration, final QuoteVm qi) {
 	 * @return The adjusted required RAM from the original one and the RAM configuration.
 	 */
 	protected double getRam(final ProvQuote configuration, final QuoteVm qi) {
-		return Math.max(128, ObjectUtils.defaultIfNull(configuration.getRamAdjustedRate(), 100)
+		return Math.max(128, ObjectUtils.getIfNull(configuration.getRamAdjustedRate(), 100)
 						* getReserved(configuration, qi.getRam(), qi.getRamMax()) / 100d);
 	}
 
diff --git a/src/main/java/org/ligoj/app/plugin/prov/ProvResource.java b/src/main/java/org/ligoj/app/plugin/prov/ProvResource.java
@@ -333,7 +333,7 @@ public QuoteVo getConfiguration(final Subscription subscription) {
 		vo.setOptimizer(quote.getOptimizer());
 		vo.setLicense(quote.getLicense());
 		vo.setUiSettings(quote.getUiSettings());
-		vo.setRamAdjustedRate(ObjectUtils.defaultIfNull(quote.getRamAdjustedRate(), 100));
+		vo.setRamAdjustedRate(ObjectUtils.getIfNull(quote.getRamAdjustedRate(), 100));
 		vo.setReservationMode(quote.getReservationMode());
 		vo.setProcessor(quote.getProcessor());
 		vo.setPhysical(quote.getPhysical());
@@ -415,8 +415,8 @@ public Floating update(@PathParam("subscription") final int subscription, final
 		var oldUsage = entity.getUsage();
 		var oldBudget = entity.getBudget();
 		var oldOptimizer = entity.getOptimizer();
-		var oldRamAdjusted = ObjectUtils.defaultIfNull(entity.getRamAdjustedRate(), 100);
-		var oldReservationMode = ObjectUtils.defaultIfNull(entity.getReservationMode(), ReservationMode.RESERVED);
+		var oldRamAdjusted = ObjectUtils.getIfNull(entity.getRamAdjustedRate(), 100);
+		var oldReservationMode = ObjectUtils.getIfNull(entity.getReservationMode(), ReservationMode.RESERVED);
 		var oldProcessor = StringUtils.trimToNull(entity.getProcessor());
 		var oldPhysical = entity.getPhysical();
 		entity.setLocation(findLocation(entity.getSubscription().getNode().getId(), vo.getLocation()));
@@ -427,7 +427,7 @@ public Floating update(@PathParam("subscription") final int subscription, final
 		entity.setOptimizer(Optional.ofNullable(vo.getOptimizer())
 				.map(u -> findConfiguredByName(optimizerRepository, u, subscription)).orElse(null));
 		entity.setLicense(vo.getLicense());
-		entity.setRamAdjustedRate(ObjectUtils.defaultIfNull(vo.getRamAdjustedRate(), 100));
+		entity.setRamAdjustedRate(ObjectUtils.getIfNull(vo.getRamAdjustedRate(), 100));
 		entity.setReservationMode(vo.getReservationMode());
 		entity.setProcessor(StringUtils.trimToNull(vo.getProcessor()));
 		entity.setPhysical(vo.getPhysical());
diff --git a/src/main/java/org/ligoj/app/plugin/prov/QuoteRelated.java b/src/main/java/org/ligoj/app/plugin/prov/QuoteRelated.java
@@ -87,13 +87,13 @@ default <T extends Costed> UpdatedCost newUpdateCost(final RestRepository<T, Int
 	 */
 	default <T extends Costed> Floating addCost(final T entity, final Function<T, Floating> costUpdater) {
 		// Save the previous costs
-		final double oldCost = ObjectUtils.defaultIfNull(entity.getCost(), 0d);
-		final double oldMaxCost = ObjectUtils.defaultIfNull(entity.getMaxCost(), 0d);
-		final double oldCo2 = ObjectUtils.defaultIfNull(entity.getCo2(), 0d);
-		final double oldMaxCo2 = ObjectUtils.defaultIfNull(entity.getMaxCo2(), 0d);
+		final double oldCost = ObjectUtils.getIfNull(entity.getCost(), 0d);
+		final double oldMaxCost = ObjectUtils.getIfNull(entity.getMaxCost(), 0d);
+		final double oldCo2 = ObjectUtils.getIfNull(entity.getCo2(), 0d);
+		final double oldMaxCo2 = ObjectUtils.getIfNull(entity.getMaxCo2(), 0d);
 
-		final double oldInitial = ObjectUtils.defaultIfNull(entity.getInitialCost(), 0d);
-		final double oldMaxInitial = ObjectUtils.defaultIfNull(entity.getMaxInitialCost(), 0d);
+		final double oldInitial = ObjectUtils.getIfNull(entity.getInitialCost(), 0d);
+		final double oldMaxInitial = ObjectUtils.getIfNull(entity.getMaxInitialCost(), 0d);
 
 		// Process the update of this entity
 		final var newCost = costUpdater.apply(entity);
diff --git a/src/main/java/org/ligoj/app/plugin/prov/catalog/AbstractImportCatalogResource.java b/src/main/java/org/ligoj/app/plugin/prov/catalog/AbstractImportCatalogResource.java
@@ -15,6 +15,7 @@
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.ligoj.app.dao.NodeRepository;
 import org.ligoj.app.model.Node;
 import org.ligoj.app.plugin.prov.Floating;
@@ -229,7 +230,7 @@ protected <T> Map<String, T> toMap(final String path, final TypeReference<Map<St
 	}
 
 	protected Double toPercent(String raw) {
-		if (StringUtils.endsWith(raw, "%")) {
+		if (Strings.CS.endsWith(raw, "%")) {
 			return Double.valueOf(raw.substring(0, raw.length() - 1));
 		}
 
@@ -365,7 +366,7 @@ protected ProvLocation installRegion(final AbstractUpdateContext context, final
 			r.setLatitude(regionStats.getLatitude());
 			r.setLongitude(regionStats.getLongitude());
 			r.setPreferred(regionStats.isPreferred());
-			r.setDescription(ObjectUtils.defaultIfNull(description, regionStats.getName()));
+			r.setDescription(ObjectUtils.getIfNull(description, regionStats.getName()));
 		});
 	}
 
@@ -618,7 +619,7 @@ protected double toConversion(final AbstractUpdateContext context, final String
 	}
 
 	private Pattern toPattern(final String regular) {
-		return Pattern.compile(StringUtils.replace(regular, ".", "\\.") + ".*");
+		return Pattern.compile(Strings.CS.replace(regular, ".", "\\.") + ".*");
 	}
 
 	/**
diff --git a/src/main/java/org/ligoj/app/plugin/prov/catalog/AbstractUpdateContext.java b/src/main/java/org/ligoj/app/plugin/prov/catalog/AbstractUpdateContext.java
@@ -3,36 +3,18 @@
  */
 package org.ligoj.app.plugin.prov.catalog;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.time.DateUtils;
 import org.ligoj.app.model.Node;
 import org.ligoj.app.plugin.prov.ProvResource;
-import org.ligoj.app.plugin.prov.model.ProvContainerPrice;
-import org.ligoj.app.plugin.prov.model.ProvContainerType;
-import org.ligoj.app.plugin.prov.model.ProvDatabasePrice;
-import org.ligoj.app.plugin.prov.model.ProvDatabaseType;
-import org.ligoj.app.plugin.prov.model.ProvFunctionPrice;
-import org.ligoj.app.plugin.prov.model.ProvFunctionType;
-import org.ligoj.app.plugin.prov.model.ProvInstancePrice;
-import org.ligoj.app.plugin.prov.model.ProvInstancePriceTerm;
-import org.ligoj.app.plugin.prov.model.ProvInstanceType;
-import org.ligoj.app.plugin.prov.model.ProvLocation;
-import org.ligoj.app.plugin.prov.model.ProvStoragePrice;
-import org.ligoj.app.plugin.prov.model.ProvStorageType;
-import org.ligoj.app.plugin.prov.model.ProvSupportPrice;
-import org.ligoj.app.plugin.prov.model.ProvSupportType;
+import org.ligoj.app.plugin.prov.model.*;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 
 /**
  * Base context used to perform catalog update.
@@ -310,6 +292,6 @@ public void cleanup() {
 	 * @return The full URL based on the base URL of this context.
 	 */
 	public String getUrl(final String relative) {
-		return baseUrl + StringUtils.prependIfMissing(relative, "/");
+		return baseUrl + Strings.CS.prependIfMissing(relative, "/");
 	}
 }
diff --git a/src/main/java/org/ligoj/app/plugin/prov/model/VmOs.java b/src/main/java/org/ligoj/app/plugin/prov/model/VmOs.java
@@ -80,6 +80,6 @@ public enum VmOs {
 	 * @return the related pricing OS.
 	 */
 	public VmOs toPricingOs() {
-		return ObjectUtils.defaultIfNull(pricingOs, this);
+		return ObjectUtils.getIfNull(pricingOs, this);
 	}
 }
diff --git a/src/main/java/org/ligoj/app/plugin/prov/quote/database/ProvQuoteDatabaseResource.java b/src/main/java/org/ligoj/app/plugin/prov/quote/database/ProvQuoteDatabaseResource.java
@@ -21,6 +21,7 @@
 import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.ligoj.app.plugin.prov.AbstractProvQuoteVmResource;
 import org.ligoj.app.plugin.prov.ProvResource;
 import org.ligoj.app.plugin.prov.UpdatedCost;
@@ -105,7 +106,7 @@ protected void saveOrUpdateSpec(final ProvQuoteDatabase entity, final QuoteDatab
 	 * @param vPrice The price attribute value.
 	 */
 	protected void checkAttribute(final String name, final String pQuote, final String vPrice) {
-		if (!StringUtils.equalsIgnoreCase(pQuote, vPrice)) {
+		if (!Strings.CI.equals(pQuote, vPrice)) {
 			// Incompatible, hack attempt?
 			log.warn("Attempt to create a database with an incompatible {} {} with catalog {} {}", name, pQuote, name,
 					vPrice);
diff --git a/src/main/java/org/ligoj/app/plugin/prov/quote/instance/ProvQuoteInstanceResource.java b/src/main/java/org/ligoj/app/plugin/prov/quote/instance/ProvQuoteInstanceResource.java
@@ -89,7 +89,7 @@ public UpdatedCost update(final QuoteInstanceEditionVo vo) {
 	@Override
 	protected void saveOrUpdateSpec(final ProvQuoteInstance entity, final QuoteInstanceEditionVo vo) {
 		entity.setSoftware(StringUtils.trimToNull(vo.getSoftware()));
-		entity.setTenancy(ObjectUtils.defaultIfNull(vo.getTenancy(), ProvTenancy.SHARED));
+		entity.setTenancy(ObjectUtils.getIfNull(vo.getTenancy(), ProvTenancy.SHARED));
 		super.saveOrUpdateSpec(entity, vo);
 		checkOs(entity);
 	}
@@ -135,7 +135,7 @@ protected List<Object[]> findLowestPrice(final ProvQuote configuration, final Qu
 		// Resolve the right license model
 		final var licenseR = normalize(getLicense(configuration, query.getLicense(), os, this::canByol));
 		final var softwareR = normalize(query.getSoftware());
-		final var tenancyR = ObjectUtils.defaultIfNull(query.getTenancy(), ProvTenancy.SHARED);
+		final var tenancyR = ObjectUtils.getIfNull(query.getTenancy(), ProvTenancy.SHARED);
 		if (optimizer == Optimizer.CO2) {
 			return ipRepository.findLowestCo2(types, terms, os, location, rate, duration, licenseR, softwareR,
 					initialCost, tenancyR, PageRequest.of(0, 1));
@@ -155,7 +155,7 @@ protected List<Object[]> findLowestDynamicPrice(final ProvQuote configuration, f
 		// Resolve the right license model
 		final var licenseR = normalize(getLicense(configuration, query.getLicense(), os, this::canByol));
 		final var softwareR = normalize(query.getSoftware());
-		final var tenancyR = ObjectUtils.defaultIfNull(query.getTenancy(), ProvTenancy.SHARED);
+		final var tenancyR = ObjectUtils.getIfNull(query.getTenancy(), ProvTenancy.SHARED);
 		if (optimizer == Optimizer.CO2) {
 			return ipRepository.findLowestDynamicCo2(types, terms, Math.ceil(Math.max(1, cpu)), gpu,
 					Math.ceil(round(ram / 1024)), os, location, rate, round(rate * duration), duration, licenseR,
diff --git a/src/main/java/org/ligoj/app/plugin/prov/quote/storage/ProvQuoteStorageResource.java b/src/main/java/org/ligoj/app/plugin/prov/quote/storage/ProvQuoteStorageResource.java
@@ -151,7 +151,7 @@ private UpdatedCost saveOrUpdate(final ProvQuoteStorage entity, final QuoteStora
 		entity.setLatency(vo.getLatency());
 		entity.setOptimized(vo.getOptimized());
 		entity.setSize(vo.getSize());
-		entity.setQuantity(ObjectUtils.defaultIfNull(vo.getQuantity(), 1));
+		entity.setQuantity(ObjectUtils.getIfNull(vo.getQuantity(), 1));
 		entity.setSizeMax(vo.getSizeMax());
 		entity.setQuoteInstance(checkInstance(subscription, vo.getInstance()));
 		entity.setQuoteDatabase(checkDatabase(subscription, vo.getDatabase()));
@@ -367,7 +367,7 @@ protected Floating getCost(final ProvQuoteStorage qs) {
 		// Sample Instance1, minQuantity=1, maxQuantity=5
 		// qs1: quantity=4, price=5$ -> displayed quantity=[4,20], price=[20$-100$]
 		// qs2: quantity=3, price=10$ -> displayed quantity=[3,15], price=[30$-150$]
-		final var quantity = (double) ObjectUtils.defaultIfNull(qs.getQuantity(), 1);
+		final var quantity = (double) ObjectUtils.getIfNull(qs.getQuantity(), 1);
 		final var base = getCost(qs.getPrice(), qs.getSize()) * quantity;
 		final var baseCo2 = getCo2(qs.getPrice(), qs.getSize()) * quantity;
 		return Optional.ofNullable(qs.getQuoteResource())
@@ -383,7 +383,7 @@ protected Floating getCost(final ProvQuoteStorage qs) {
 	 * @return The cost of this storage.
 	 */
 	private double getCost(final ProvStoragePrice storagePrice, final int size) {
-		final double increment = ObjectUtils.defaultIfNull(storagePrice.getType().getIncrement(), 1d);
+		final double increment = ObjectUtils.getIfNull(storagePrice.getType().getIncrement(), 1d);
 		return round(Math.ceil(round(Math.max(size, storagePrice.getType().getMinimal()) / increment)) * increment
 				* storagePrice.getCostGb() + storagePrice.getCost());
 	}
@@ -396,7 +396,7 @@ private double getCost(final ProvStoragePrice storagePrice, final int size) {
 	 * @return The cost of this storage.
 	 */
 	private double getCo2(final ProvStoragePrice storagePrice, final int size) {
-		final double increment = ObjectUtils.defaultIfNull(storagePrice.getType().getIncrement(), 1d);
+		final double increment = ObjectUtils.getIfNull(storagePrice.getType().getIncrement(), 1d);
 		return round(Math.ceil(round(Math.max(size, storagePrice.getType().getMinimal()) / increment)) * increment * 0
 				+ storagePrice.getCo2());
 	}
diff --git a/src/main/java/org/ligoj/app/plugin/prov/quote/support/ProvQuoteSupportResource.java b/src/main/java/org/ligoj/app/plugin/prov/quote/support/ProvQuoteSupportResource.java
@@ -303,7 +303,7 @@ private Double getCost(final Integer seats, final double cost, final ProvSupport
 	}
 
 	private int[] toIntArray(String rawString) {
-		return Arrays.stream(StringUtils.split(ObjectUtils.defaultIfNull(rawString, ""), ","))
+		return Arrays.stream(StringUtils.split(ObjectUtils.getIfNull(rawString, ""), ","))
 				.mapToInt(Integer::parseInt).toArray();
 	}
 
diff --git a/src/main/java/org/ligoj/app/plugin/prov/quote/upload/ProvQuoteUploadResource.java b/src/main/java/org/ligoj/app/plugin/prov/quote/upload/ProvQuoteUploadResource.java
@@ -319,7 +319,7 @@ public void upload(@PathParam("subscription") final int subscription,
 		log.info("Upload provisioning requested...");
 		subscriptionResource.checkVisible(subscription);
 		final var quote = resource.getRepository().findBy("subscription.id", subscription);
-		final var safeEncoding = ObjectUtils.defaultIfNull(encoding, DEFAULT_ENCODING);
+		final var safeEncoding = ObjectUtils.getIfNull(encoding, DEFAULT_ENCODING);
 
 		// Check headers validity
 		final String[] headersArray;
@@ -390,7 +390,7 @@ private <V extends AbstractQuoteVmEditionVo> V copy(final int subscription, fina
 		// Validate the upload object
 		vo.setName(u.getName());
 		vo.setDescription(u.getDescription());
-		vo.setCpu(qiResource.round(ObjectUtils.defaultIfNull(u.getCpu(), 0d)));
+		vo.setCpu(qiResource.round(ObjectUtils.getIfNull(u.getCpu(), 0d)));
 		vo.setGpu(u.getGpu());
 		vo.setProcessor(u.getProcessor());
 		vo.setLicense(Optional.ofNullable(u.getLicense()).map(StringUtils::upperCase).orElse(null));
@@ -405,21 +405,21 @@ private <V extends AbstractQuoteVmEditionVo> V copy(final int subscription, fina
 		vo.setStorageRate(u.getStorageRate());
 		vo.setWorkload(u.getWorkload());
 		vo.setPhysical(u.getPhysical());
-		vo.setRam(ObjectUtils.defaultIfNull(ramMultiplier, 1) * ObjectUtils.defaultIfNull(u.getRam(), 0).intValue());
+		vo.setRam(ObjectUtils.getIfNull(ramMultiplier, 1) * ObjectUtils.getIfNull(u.getRam(), 0).intValue());
 		vo.setSubscription(subscription);
 		vo.setType(u.getType());
 		vo.setCpuMax(u.getCpuMax());
 		vo.setGpuMax(u.getGpuMax());
 		vo.setRamMax(
-				u.getRamMax() == null ? null : ObjectUtils.defaultIfNull(ramMultiplier, 1) * u.getRamMax().intValue());
+				u.getRamMax() == null ? null : ObjectUtils.getIfNull(ramMultiplier, 1) * u.getRamMax().intValue());
 		completeUsage(context, defaultUsage, createUsage, u, vo);
 		completeBudget(context, defaultBudget, createBudget, u, vo);
 		completeOptimizer(context, defaultOptimizer, createOptimizer, u, vo);
 		return vo;
 	}
 
 	private ValidationJsonException handleValidationError(final VmUpload i, final ValidationJsonException e) {
-		final var failedEntry = ObjectUtils.defaultIfNull(i.getName(), "<unknown>");
+		final var failedEntry = ObjectUtils.getIfNull(i.getName(), "<unknown>");
 		log.info("Upload provisioning failed for entry {}", failedEntry, e);
 		final var errors = e.getErrors();
 		new ArrayList<>(errors.keySet()).stream().peek(p -> errors.put("csv-file." + p, errors.get(p)))
@@ -454,15 +454,15 @@ private void persist(final int subscription, final String defaultUsage, final St
 
 		if (StringUtils.isNotEmpty(i.getEngine())) {
 			// Database case
-			final var merger = mergersDatabase.get(ObjectUtils.defaultIfNull(mode, MergeMode.KEEP));
+			final var merger = mergersDatabase.get(ObjectUtils.getIfNull(mode, MergeMode.KEEP));
 			final var vo = copy(subscription, context, defaultUsage, defaultBudget, defaultOptimizer, ramMultiplier,
 					createUsage, createBudget, createOptimizer, i, newDatabaseVo(i));
 			vo.setPrice(
 					qbResource.validateLookup("database", qbResource.lookup(context.quote, vo), vo.getName()).getId());
 			persist(i, subscription, merger, context, vo, QuoteStorageEditionVo::setDatabase, ResourceType.DATABASE);
 		} else {
 			// Instance/Container case
-			final var merger = mergersInstance.get(ObjectUtils.defaultIfNull(mode, MergeMode.KEEP));
+			final var merger = mergersInstance.get(ObjectUtils.getIfNull(mode, MergeMode.KEEP));
 			final var vo = copy(subscription, context, defaultUsage, defaultBudget, defaultOptimizer, ramMultiplier,
 					createUsage, createBudget, createOptimizer, i, newInstanceVo(i));
 			vo.setPrice(
@@ -581,7 +581,7 @@ private <V extends AbstractQuoteVmEditionVo> void persist(final VmUpload upload,
 				}).toList();
 
 		// Tags part
-		Arrays.stream(StringUtils.split(ObjectUtils.defaultIfNull(upload.getTags(), ""), ",;|"))
+		Arrays.stream(StringUtils.split(ObjectUtils.getIfNull(upload.getTags(), ""), ",;|"))
 				.map(StringUtils::trimToNull).filter(Objects::nonNull).forEach(t -> {
 					// Instance tags
 					final var tag = new TagEditionVo();
diff --git a/src/main/java/org/ligoj/app/plugin/prov/terraform/TerraformResource.java b/src/main/java/org/ligoj/app/plugin/prov/terraform/TerraformResource.java
@@ -13,6 +13,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.ligoj.app.dao.SubscriptionRepository;
 import org.ligoj.app.model.Node;
 import org.ligoj.app.model.Subscription;
@@ -261,7 +262,7 @@ public void sequenceNewTransaction(final TerraformContext context) throws IOExce
 	protected void clean(final Subscription subscription) throws IOException {
 		final var parent = utils.toFile(subscription).toPath();
 		try (var files = Files.walk(parent)) {
-			files.filter(path -> !StringUtils.endsWithAny(path.toString(), ".tfstate", ".tfstate.backup", ".keep.tf",
+			files.filter(path -> !Strings.CS.endsWithAny(path.toString(), ".tfstate", ".tfstate.backup", ".keep.tf",
 					".keep.auto.tfvars")).filter(path -> !path.toFile().isDirectory())
 					.filter(path -> !path.toString().contains(".terraform")).map(java.nio.file.Path::toFile)
 					.forEach(FileUtils::deleteQuietly);
diff --git a/src/main/java/org/ligoj/app/plugin/prov/terraform/TerraformUtils.java b/src/main/java/org/ligoj/app/plugin/prov/terraform/TerraformUtils.java

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`import org.apache.commons.lang3.EnumUtils;`
`16`	`16`	`import org.apache.commons.lang3.ObjectUtils;`
`17`	`17`	`import org.apache.commons.lang3.StringUtils;`
	`18`	`+import org.apache.commons.lang3.Strings;`
`18`	`19`	`import org.ligoj.app.dao.NodeRepository;`
`19`	`20`	`import org.ligoj.app.model.Node;`
`20`	`21`	`import org.ligoj.app.plugin.prov.Floating;`
`@@ -229,7 +230,7 @@ protected <T> Map<String, T> toMap(final String path, final TypeReference<Map<St`
`229`	`230`	`}`
`230`	`231`
`231`	`232`	`protected Double toPercent(String raw) {`
`232`		`- if (StringUtils.endsWith(raw, "%")) {`
	`233`	`+ if (Strings.CS.endsWith(raw, "%")) {`
`233`	`234`	`return Double.valueOf(raw.substring(0, raw.length() - 1));`
`234`	`235`	`}`
`235`	`236`
`@@ -365,7 +366,7 @@ protected ProvLocation installRegion(final AbstractUpdateContext context, final`
`365`	`366`	`r.setLatitude(regionStats.getLatitude());`
`366`	`367`	`r.setLongitude(regionStats.getLongitude());`
`367`	`368`	`r.setPreferred(regionStats.isPreferred());`
`368`		`- r.setDescription(ObjectUtils.defaultIfNull(description, regionStats.getName()));`
	`369`	`+ r.setDescription(ObjectUtils.getIfNull(description, regionStats.getName()));`
`369`	`370`	`});`
`370`	`371`	`}`
`371`	`372`
`@@ -618,7 +619,7 @@ protected double toConversion(final AbstractUpdateContext context, final String`
`618`	`619`	`}`
`619`	`620`
`620`	`621`	`private Pattern toPattern(final String regular) {`
`621`		`- return Pattern.compile(StringUtils.replace(regular, ".", "\\.") + ".*");`
	`622`	`+ return Pattern.compile(Strings.CS.replace(regular, ".", "\\.") + ".*");`
`622`	`623`	`}`
`623`	`624`
`624`	`625`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,6 @@ public enum VmOs {`
`80`	`80`	`* @return the related pricing OS.`
`81`	`81`	`*/`
`82`	`82`	`public VmOs toPricingOs() {`
`83`		`- return ObjectUtils.defaultIfNull(pricingOs, this);`
	`83`	`+ return ObjectUtils.getIfNull(pricingOs, this);`
`84`	`84`	`}`
`85`	`85`	`}`