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

restore pretty printing support, fix client update due to detect changes error.

Browse Source
This commit is contained in:
Keith Woodlock
2012-12-05 12:16:40 +00:00
parent 184ec07487
commit 075efe2712
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionServiceJdbc.java
+2 -3
View File
@@ -3,7 +3,6 @@ package org.mifosplatform.commands.service;
import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionService; import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionService;
import org.mifosplatform.infrastructure.core.serialization.CommandSerializer; import org.mifosplatform.infrastructure.core.serialization.CommandSerializer;
import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer;
import org.mifosplatform.infrastructure.dataqueries.service.ReadWriteNonCoreDataServiceImpl;
import org.mifosplatform.portfolio.client.command.ClientCommand; import org.mifosplatform.portfolio.client.command.ClientCommand;
import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.data.ClientData;
import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
@@ -16,7 +15,7 @@ import org.springframework.stereotype.Service;
public class ChangeDetectionServiceJdbc implements ChangeDetectionService { public class ChangeDetectionServiceJdbc implements ChangeDetectionService {
private final static Logger logger = LoggerFactory.getLogger(ChangeDetectionServiceJdbc.class); private final static Logger logger = LoggerFactory.getLogger(ChangeDetectionServiceJdbc.class);
private final PortfolioApiDataConversionService apiDataConversionService; private final PortfolioApiDataConversionService apiDataConversionService;
private final ClientReadPlatformService clientReadPlatformService; private final ClientReadPlatformService clientReadPlatformService;
private final CommandSerializer commandSerializerService; private final CommandSerializer commandSerializerService;
@@ -34,7 +33,7 @@ public class ChangeDetectionServiceJdbc implements ChangeDetectionService {
@Override @Override
public String detectChangesOnUpdate(final String resourceName, final Long resourceId, final String commandSerializedAsJson) { public String detectChangesOnUpdate(final String resourceName, final Long resourceId, final String commandSerializedAsJson) {
logger.info(resourceName + ": ID: " + resourceId + " JSON: " + commandSerializedAsJson); logger.info(resourceName + ": ID: " + resourceId + " JSON: " + commandSerializedAsJson);
String changesOnlyJson = ""; String changesOnlyJson = "";
if ("clients".equalsIgnoreCase(resourceName)) { if ("clients".equalsIgnoreCase(resourceName)) {
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiDataConversionServiceImpl.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class PortfolioApiDataConversionServiceImpl implements PortfolioApiDataCo
final String baseExternalId = helper.extractStringNamed(externalIdParamName, baseElement, ignoreParameters); final String baseExternalId = helper.extractStringNamed(externalIdParamName, baseElement, ignoreParameters);
final String workingExternalId = helper.extractStringNamed(externalIdParamName, workingElement, ignoreParameters); final String workingExternalId = helper.extractStringNamed(externalIdParamName, workingElement, ignoreParameters);
if (differenceExists(baseExternalId, workingExternalId)) { if (differenceExists(baseExternalId, workingExternalId)) {
firstname = workingExternalId; externalId = workingExternalId;
parametersPassedInRequest.add(externalIdParamName); parametersPassedInRequest.add(externalIdParamName);
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/serialization/DefaultToApiJsonSerializer.java
+2 -2
View File
@@ -16,13 +16,13 @@ import com.google.gson.Gson;
public final class DefaultToApiJsonSerializer<T> implements ToApiJsonSerializer<T> { public final class DefaultToApiJsonSerializer<T> implements ToApiJsonSerializer<T> {
private final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOff; private final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOff;
private final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOn; private final ExcludeNothingWithPrettyPrintingOnJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOn;
private final GoogleGsonSerializerHelper helper; private final GoogleGsonSerializerHelper helper;
@Autowired @Autowired
public DefaultToApiJsonSerializer( public DefaultToApiJsonSerializer(
final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOff, final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOff,
final ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOn, final ExcludeNothingWithPrettyPrintingOnJsonSerializerGoogleGson excludeNothingWithPrettyPrintingOn,
final GoogleGsonSerializerHelper helper) { final GoogleGsonSerializerHelper helper) {
this.excludeNothingWithPrettyPrintingOff = excludeNothingWithPrettyPrintingOff; this.excludeNothingWithPrettyPrintingOff = excludeNothingWithPrettyPrintingOff;
this.excludeNothingWithPrettyPrintingOn = excludeNothingWithPrettyPrintingOn; this.excludeNothingWithPrettyPrintingOn = excludeNothingWithPrettyPrintingOn;