CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Liquibase compatibility fix

Browse Source
This commit is contained in:
Arnold Galovics
2024-01-18 11:23:51 +01:00
committed by Arnold Gálovics
parent 9a7a425696
commit 51028fdbd0
33 changed files with 175 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java
Vendored
+1 -1
View File
@@ -126,7 +126,7 @@ public class RuntimeDelegatingCacheManager implements CacheManager, Initializing
Objects.requireNonNull(ehCacheManager.getCache(cacheName)).clear();
}
} catch (NullPointerException npe) {
log.warn(npe.getMessage());
log.warn("NullPointerException occurred", npe);
}
}
}
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/api/DateParam.java
+1 -2
View File
@@ -18,7 +18,6 @@
*/
package org.apache.fineract.infrastructure.core.api;
import jakarta.ws.rs.WebApplicationException;
import java.time.LocalDate;
import java.util.Locale;
import org.apache.fineract.infrastructure.core.data.DateFormat;
@@ -31,7 +30,7 @@ public class DateParam {
private final String dateAsString;
public DateParam(final String dateStr) throws WebApplicationException {
public DateParam(final String dateStr) {
this.dateAsString = dateStr;
}
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
+7 -5
View File
@@ -19,14 +19,14 @@
package org.apache.fineract.infrastructure.core.exception;
import com.google.common.io.CharStreams;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
/**
* Exception with multiple root causes.
@@ -45,11 +45,12 @@ import org.slf4j.LoggerFactory;
*
* @author Michael Vorburger.ch <mike@vorburger.ch>
*/
@Slf4j
public class MultiException extends Exception {
private static final Logger LOG = LoggerFactory.getLogger(MultiException.class);
private final List<Throwable> throwables;
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
public MultiException(List<Throwable> problems) {
super("MultiException with " + problems.size() + " contained causes (details available)");
if (problems.isEmpty()) {
@@ -80,11 +81,12 @@ public class MultiException extends Exception {
@Override
@SuppressWarnings("RegexpSinglelineJava")
@SuppressFBWarnings("SLF4J_SIGN_ONLY_FORMAT")
public void printStackTrace() {
LOG.error("{}", super.getMessage());
log.error("{}", super.getMessage());
int i = 0;
for (Throwable e : throwables) {
LOG.error("{}.", ++i);
log.error("{}.", ++i);
e.printStackTrace();
}
}
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java
+2
View File
@@ -22,6 +22,7 @@ import static org.apache.fineract.infrastructure.core.domain.FineractPlatformTen
import static org.apache.fineract.infrastructure.core.domain.FineractPlatformTenantConnection.toProtocol;
import com.zaxxer.hikari.HikariConfig;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import javax.sql.DataSource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -60,6 +61,7 @@ public class DataSourcePerTenantServiceFactory {
this.databasePasswordEncryptor = databasePasswordEncryptor;
}
@SuppressFBWarnings(value = "SLF4J_SIGN_ONLY_FORMAT")
public DataSource createNewDataSourceFor(final FineractPlatformTenantConnection tenantConnection) {
if (!databasePasswordEncryptor.isMasterPasswordHashValid(tenantConnection.getMasterPasswordHash())) {
throw new IllegalArgumentException(