diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java index 51814cfa6..84f9c7764 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java @@ -26,46 +26,38 @@ import org.springframework.stereotype.Component; @Scope("singleton") public class AuditApiResource { - private final Set RESPONSE_DATA_PARAMETERS = new HashSet( - Arrays.asList("id", "apiOperation", "resource", "resourceId", - "makerId", "madeOnDate", "checkerId", "checkedOnDate", - "commandAsJson")); - private final String resourceNameForPermissions = "AUDIT"; + private final Set RESPONSE_DATA_PARAMETERS = new HashSet(Arrays.asList("id", "apiOperation", "resource", "resourceId", + "makerId", "madeOnDate", "checkerId", "checkedOnDate", "commandAsJson")); + private final String resourceNameForPermissions = "AUDIT"; - private final PlatformSecurityContext context; - private final AuditReadPlatformService auditReadPlatformService; - private final ApiRequestParameterHelper apiRequestParameterHelper; - private final DefaultToApiJsonSerializer toApiJsonSerializer; + private final PlatformSecurityContext context; + private final AuditReadPlatformService auditReadPlatformService; + private final ApiRequestParameterHelper apiRequestParameterHelper; + private final DefaultToApiJsonSerializer toApiJsonSerializer; - @Autowired - public AuditApiResource(final PlatformSecurityContext context, - final AuditReadPlatformService auditReadPlatformService, - final ApiRequestParameterHelper apiRequestParameterHelper, - final DefaultToApiJsonSerializer toApiJsonSerializer) { - this.context = context; - this.auditReadPlatformService = auditReadPlatformService; - this.apiRequestParameterHelper = apiRequestParameterHelper; - this.toApiJsonSerializer = toApiJsonSerializer; - } + @Autowired + public AuditApiResource(final PlatformSecurityContext context, final AuditReadPlatformService auditReadPlatformService, + final ApiRequestParameterHelper apiRequestParameterHelper, final DefaultToApiJsonSerializer toApiJsonSerializer) { + this.context = context; + this.auditReadPlatformService = auditReadPlatformService; + this.apiRequestParameterHelper = apiRequestParameterHelper; + this.toApiJsonSerializer = toApiJsonSerializer; + } - @GET - @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) - public String retrieveAuditEntries(@Context final UriInfo uriInfo) { + @GET + @Consumes({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON }) + public String retrieveAuditEntries(@Context final UriInfo uriInfo) { - context.authenticatedUser().validateHasReadPermission( - resourceNameForPermissions); + context.authenticatedUser().validateHasReadPermission(resourceNameForPermissions); - // final String extraCriteria = getCriteria(sqlSearch, officeId, - // externalId, displayName, firstName, lastName, hierarchy); + // final String extraCriteria = getCriteria(sqlSearch, officeId, + // externalId, displayName, firstName, lastName, hierarchy); - final Collection auditEntries = this.auditReadPlatformService - .retrieveAuditEntries(); + final Collection auditEntries = this.auditReadPlatformService.retrieveAuditEntries(); - final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper - .process(uriInfo.getQueryParameters()); - return this.toApiJsonSerializer.serialize(settings, auditEntries, - RESPONSE_DATA_PARAMETERS); - } + final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper.process(uriInfo.getQueryParameters()); + return this.toApiJsonSerializer.serialize(settings, auditEntries, RESPONSE_DATA_PARAMETERS); + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditData.java b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditData.java index 214861049..ca0b24e05 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditData.java @@ -7,66 +7,36 @@ import org.joda.time.LocalDate; */ final public class AuditData { - private final Long id; - private final String apiOperation; - private final String resource; - private final Long resourceId; - private final String maker; - private final LocalDate madeOnDate; - private final String checker; - private final LocalDate checkedOnDate; - private final String commandAsJson; + @SuppressWarnings("unused") + private final Long id; + @SuppressWarnings("unused") + private final String apiOperation; + @SuppressWarnings("unused") + private final String resource; + @SuppressWarnings("unused") + private final Long resourceId; + @SuppressWarnings("unused") + private final String maker; + @SuppressWarnings("unused") + private final LocalDate madeOnDate; + @SuppressWarnings("unused") + private final String checker; + @SuppressWarnings("unused") + private final LocalDate checkedOnDate; + @SuppressWarnings("unused") + private final String commandAsJson; - public AuditData(final Long id, final String apiOperation, - final String resource, final Long resourceId, final String maker, - final LocalDate madeOnDate, final String checker, - final LocalDate checkedOnDate, final String commandAsJson) { - - this.id = id; - this.apiOperation = apiOperation; - this.resource = resource; - this.resourceId = resourceId; - this.maker = maker; - this.madeOnDate = madeOnDate; - this.checker = checker; - this.checkedOnDate = checkedOnDate; - this.commandAsJson = commandAsJson; - } - - public Long getId() { - return this.id; - } - - public String getApiOperation() { - return this.apiOperation; - } - - public String getResource() { - return this.resource; - } - - public Long getResourceId() { - return this.resourceId; - } - - public String getMaker() { - return this.maker; - } - - public LocalDate getMadeOnDate() { - return this.madeOnDate; - } - - public String getChecker() { - return this.checker; - } - - public LocalDate getCheckedOnDate() { - return this.checkedOnDate; - } - - public String getCommandAsJson() { - return this.commandAsJson; - } + public AuditData(final Long id, final String apiOperation, final String resource, final Long resourceId, final String maker, + final LocalDate madeOnDate, final String checker, final LocalDate checkedOnDate, final String commandAsJson) { + this.id = id; + this.apiOperation = apiOperation; + this.resource = resource; + this.resourceId = resourceId; + this.maker = maker; + this.madeOnDate = madeOnDate; + this.checker = checker; + this.checkedOnDate = checkedOnDate; + this.commandAsJson = commandAsJson; + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformService.java index e7a978b00..15c1f5344 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformService.java @@ -4,6 +4,6 @@ import java.util.Collection; public interface AuditReadPlatformService { - Collection retrieveAuditEntries(); + Collection retrieveAuditEntries(); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformServiceImpl.java index b87fb5840..3f519f36c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditReadPlatformServiceImpl.java @@ -16,57 +16,49 @@ import org.springframework.stereotype.Service; @Service public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { - private final JdbcTemplate jdbcTemplate; - private final PlatformSecurityContext context; + private final JdbcTemplate jdbcTemplate; + private final PlatformSecurityContext context; - @Autowired - public AuditReadPlatformServiceImpl(final PlatformSecurityContext context, - final TenantAwareRoutingDataSource dataSource) { - this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); - } + @Autowired + public AuditReadPlatformServiceImpl(final PlatformSecurityContext context, final TenantAwareRoutingDataSource dataSource) { + this.context = context; + this.jdbcTemplate = new JdbcTemplate(dataSource); + } - private static final class AuditMapper implements RowMapper { + private static final class AuditMapper implements RowMapper { - public String schema() { - return " mc.id as id, mc.api_operation as apiOperation, mc.api_resource as resource, mc.resource_id as resourceId," - + " mk.username as maker, mc.made_on_date as madeOnDate, ck.username as checker, mc.checked_on_date as checkedOnDate, mc.command_as_json as commandAsJson " - + " from m_portfolio_command_source mc " - + " left join m_appuser mk on mk.id = mc.maker_id" - + " left join m_appuser ck on ck.id = mc.checker_id"; - } + public String schema() { + return " mc.id as id, mc.api_operation as apiOperation, mc.api_resource as resource, mc.resource_id as resourceId," + + " mk.username as maker, mc.made_on_date as madeOnDate, ck.username as checker, mc.checked_on_date as checkedOnDate, mc.command_as_json as commandAsJson " + + " from m_portfolio_command_source mc " + " left join m_appuser mk on mk.id = mc.maker_id" + + " left join m_appuser ck on ck.id = mc.checker_id"; + } - @Override - public AuditData mapRow(final ResultSet rs, - @SuppressWarnings("unused") final int rowNum) - throws SQLException { + @Override + public AuditData mapRow(final ResultSet rs, @SuppressWarnings("unused") final int rowNum) throws SQLException { - final Long id = rs.getLong("id"); - final String apiOperation = rs.getString("apiOperation"); - final String resource = rs.getString("resource"); - final Long resourceId = JdbcSupport.getLong(rs, "resourceId"); - final String maker = rs.getString("maker"); - final LocalDate madeOnDate = JdbcSupport.getLocalDate(rs, - "madeOnDate"); - final String checker = rs.getString("checker"); - final LocalDate checkedOnDate = JdbcSupport.getLocalDate(rs, - "checkedOnDate"); - final String taskJson = rs.getString("taskJson"); - return new AuditData(id, apiOperation, resource, resourceId, maker, - madeOnDate, checker, checkedOnDate, taskJson); - } - } + final Long id = rs.getLong("id"); + final String apiOperation = rs.getString("apiOperation"); + final String resource = rs.getString("resource"); + final Long resourceId = JdbcSupport.getLong(rs, "resourceId"); + final String maker = rs.getString("maker"); + final LocalDate madeOnDate = JdbcSupport.getLocalDate(rs, "madeOnDate"); + final String checker = rs.getString("checker"); + final LocalDate checkedOnDate = JdbcSupport.getLocalDate(rs, "checkedOnDate"); + final String commandAsJson = rs.getString("commandAsJson"); + return new AuditData(id, apiOperation, resource, resourceId, maker, madeOnDate, checker, checkedOnDate, commandAsJson); + } + } - @Override - public Collection retrieveAuditEntries() { - context.authenticatedUser(); + @Override + public Collection retrieveAuditEntries() { + context.authenticatedUser(); - final AuditMapper rm = new AuditMapper(); - final String sql = "select " - + rm.schema() - + " where mc.checker_id is null order by mc.made_on_date DESC, mc.api_resource ASC, mc.api_operation ASC"; + final AuditMapper rm = new AuditMapper(); + final String sql = "select " + rm.schema() + + " where mc.checker_id is null order by mc.made_on_date DESC, mc.api_resource ASC, mc.api_operation ASC"; - return this.jdbcTemplate.query(sql, rm, new Object[] {}); - } + return this.jdbcTemplate.query(sql, rm, new Object[] {}); + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml index d68ed7732..b594b5fcb 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml @@ -17,6 +17,7 @@