From de77996e6669efbbbae0cfa64d3fd515e026e80e Mon Sep 17 00:00:00 2001 From: ibondarenko Date: Wed, 16 Oct 2019 10:55:35 +0300 Subject: [PATCH] FINERACT-724 fixes after review (part2) --- .../core/service/PaginationHelper.java | 1 - .../infrastructure/openjpa/OpenJpaDialect.java | 8 ++++++++ .../openjpa/OpenJpaVendorAdapter.java | 14 +++++++++++++- .../TenantAwareBasicAuthenticationFilter.java | 1 - .../SmsMessageScheduledJobServiceImpl.java | 5 ++--- .../main/resources/META-INF/spring/appContext.xml | 2 -- .../apache/fineract/notification/StorageTest.java | 2 +- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java index d76ce8059..8e8a80024 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java @@ -32,7 +32,6 @@ public class PaginationHelper { final List items = jt.query(sqlFetchRows, args, rowMapper); // determine how many rows are available -// final int totalFilteredRecords = jt.queryForInt(sqlCountRows); final int totalFilteredRecords = jt.queryForObject(sqlCountRows, Integer.class); return new Page<>(items, totalFilteredRecords); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java index 555c8c179..b10804967 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java @@ -38,6 +38,14 @@ import org.springframework.transaction.SavepointManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; +/** + * {@link org.springframework.orm.jpa.JpaDialect} implementation for Apache OpenJPA. + * Developed and tested against OpenJPA 2.2. + * + * @author Costin Leau + * @author Juergen Hoeller + * @since 2.0 + */ public class OpenJpaDialect extends DefaultJpaDialect { @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java index 3d30fac8c..cccad74c7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java @@ -30,7 +30,19 @@ import org.apache.openjpa.persistence.PersistenceProviderImpl; import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; import org.springframework.orm.jpa.vendor.Database; - +/** + * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Apache OpenJPA. + * Developed and tested against OpenJPA 2.2. + * + *

Exposes OpenJPA's persistence provider and EntityManager extension interface, + * and supports {@link AbstractJpaVendorAdapter}'s common configuration settings. + * + * @author Costin Leau + * @author Juergen Hoeller + * @since 2.0 + * @see org.apache.openjpa.persistence.PersistenceProviderImpl + * @see org.apache.openjpa.persistence.OpenJPAEntityManager + */ public class OpenJpaVendorAdapter extends AbstractJpaVendorAdapter { private final PersistenceProvider persistenceProvider = new PersistenceProviderImpl(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java index 164d12d34..5756b5719 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java @@ -147,7 +147,6 @@ public class TenantAwareBasicAuthenticationFilter extends BasicAuthenticationFil } } -// filterChain.doFilter(request, response); super.doFilterInternal(request, response, filterChain); } catch (final InvalidTenantIdentiferException e) { // deal with exception at low level diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java index 7919051df..5fa2ab8ae 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java @@ -286,8 +286,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob if (!smsMessageDeliveryReportData.getHasError() && (deliveryStatus != 100)) { SmsMessage smsMessage = this.smsMessageRepository.findById(smsMessageDeliveryReportData.getId()).orElse(null); - Integer statusType; - boolean statusChanged; + Integer statusType = smsMessage.getStatusType(); switch (deliveryStatus) { case 0: @@ -312,7 +311,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob break; } - statusChanged = !statusType.equals(smsMessage.getStatusType()); + boolean statusChanged = !statusType.equals(smsMessage.getStatusType()); // update the status Type enum smsMessage.setStatusType(statusType); diff --git a/fineract-provider/src/main/resources/META-INF/spring/appContext.xml b/fineract-provider/src/main/resources/META-INF/spring/appContext.xml index 22d5d5c74..6e041445b 100644 --- a/fineract-provider/src/main/resources/META-INF/spring/appContext.xml +++ b/fineract-provider/src/main/resources/META-INF/spring/appContext.xml @@ -34,8 +34,6 @@ - -