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

Merge pull request #1546 from theupscale/template

Browse Source 
Reverted Back to basicAuth MIFOSX-2322
This commit is contained in:
pramod
2015-12-02 11:23:54 +05:30
parent 2d214fd6d0 95c2921ff0
commit 64ab498c9f
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java
+14 -4
View File
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil;
import org.mifosplatform.template.domain.Template; import org.mifosplatform.template.domain.Template;
import org.mifosplatform.template.domain.TemplateFunctions; import org.mifosplatform.template.domain.TemplateFunctions;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -38,6 +39,7 @@ import com.github.mustachejava.MustacheFactory;
@Service @Service
public class TemplateMergeService { public class TemplateMergeService {
private final static Logger logger = LoggerFactory.getLogger(TemplateMergeService.class); private final static Logger logger = LoggerFactory.getLogger(TemplateMergeService.class);
// private final FromJsonHelper fromApiJsonHelper; // private final FromJsonHelper fromApiJsonHelper;
private Map<String, Object> scopes; private Map<String, Object> scopes;
@@ -46,16 +48,18 @@ public class TemplateMergeService {
// @Autowired // @Autowired
// public TemplateMergeService(final FromJsonHelper fromApiJsonHelper) { // public TemplateMergeService(final FromJsonHelper fromApiJsonHelper) {
// this.fromApiJsonHelper = fromApiJsonHelper; // this.fromApiJsonHelper = fromApiJsonHelper;
// } //
public void setAuthToken(final String authToken) { public void setAuthToken(final String authToken) {
this.authToken = authToken; //final String auth = ThreadLocalContextUtil.getAuthToken();
this.authToken = authToken;
} }
public String compile(final Template template, final Map<String, Object> scopes) throws MalformedURLException, IOException { public String compile(final Template template, final Map<String, Object> scopes) throws MalformedURLException, IOException {
this.scopes = scopes; this.scopes = scopes;
this.scopes.put("static", new TemplateFunctions()); this.scopes.put("static", new TemplateFunctions());
final MustacheFactory mf = new DefaultMustacheFactory(); final MustacheFactory mf = new DefaultMustacheFactory();
final Mustache mustache = mf.compile(new StringReader(template.getText()), template.getName()); final Mustache mustache = mf.compile(new StringReader(template.getText()), template.getName());
@@ -169,6 +173,8 @@ public class TemplateMergeService {
private void expandMapArrays(Object value) { private void expandMapArrays(Object value) {
if (value instanceof Map) { if (value instanceof Map) {
Map<String, Object> valueAsMap = (Map<String, Object>) value; Map<String, Object> valueAsMap = (Map<String, Object>) value;
//Map<String, Object> newValue = null;
Map<String,Object> valueAsMap_second = new HashMap<>();
for (Entry<String, Object> valueAsMapEntry : valueAsMap.entrySet()) { for (Entry<String, Object> valueAsMapEntry : valueAsMap.entrySet()) {
Object valueAsMapEntryValue = valueAsMapEntry.getValue(); Object valueAsMapEntryValue = valueAsMapEntry.getValue();
if (valueAsMapEntryValue instanceof Map) { // JSON Object if (valueAsMapEntryValue instanceof Map) { // JSON Object
@@ -178,12 +184,16 @@ public class TemplateMergeService {
String valueAsMapEntryKey = valueAsMapEntry.getKey(); String valueAsMapEntryKey = valueAsMapEntry.getKey();
int i = 0; int i = 0;
for (Object object : valueAsMapEntryValueIterable) { for (Object object : valueAsMapEntryValueIterable) {
valueAsMap.put(valueAsMapEntryKey + "#" + i, object); valueAsMap_second.put(valueAsMapEntryKey + "#" + i, object);
++i; ++i;
expandMapArrays(object); expandMapArrays(object);
} }
} }
} }
valueAsMap.putAll(valueAsMap_second);
} }
} }