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

Reverted Back to basicauth

Browse Source
This commit is contained in:
Maek Twain
2015-11-17 15:33:07 +05:30
parent b52e3bc233
commit 95c2921ff0
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java
+5 -15
View File
@@ -59,8 +59,7 @@ public class TemplateMergeService {
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 String auth = ThreadLocalContextUtil.getAuthToken();
setAuthToken(auth);
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());
@@ -129,7 +128,7 @@ public class TemplateMergeService {
try { try {
connection = (HttpURLConnection) new URL(url).openConnection(); connection = (HttpURLConnection) new URL(url).openConnection();
if (this.authToken != null) { if (this.authToken != null) {
connection.setRequestProperty("Authorization", "Bearer " + this.authToken); connection.setRequestProperty("Authorization", "Basic " + this.authToken);
} }
TrustModifier.relaxHostChecking(connection); TrustModifier.relaxHostChecking(connection);
@@ -173,36 +172,27 @@ public class TemplateMergeService {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void expandMapArrays(Object value) { private void expandMapArrays(Object value) {
if (value instanceof Map) { if (value instanceof Map) {
System.out.println(value);
Map<String, Object> valueAsMap = (Map<String, Object>) value; Map<String, Object> valueAsMap = (Map<String, Object>) value;
//Map<String, Object> newValue = null; //Map<String, Object> newValue = null;
Map<String,Object> myNewMap = new HashMap<>(); Map<String,Object> valueAsMap_second = new HashMap<>();
for (Entry<String, Object> valueAsMapEntry : valueAsMap.entrySet()) { for (Entry<String, Object> valueAsMapEntry : valueAsMap.entrySet()) {
System.out.println(valueAsMapEntry);
Object valueAsMapEntryValue = valueAsMapEntry.getValue(); Object valueAsMapEntryValue = valueAsMapEntry.getValue();
System.out.println(valueAsMapEntryValue);
if (valueAsMapEntryValue instanceof Map) { // JSON Object if (valueAsMapEntryValue instanceof Map) { // JSON Object
expandMapArrays(valueAsMapEntryValue); expandMapArrays(valueAsMapEntryValue);
System.out.println(valueAsMapEntryValue);
} else if (valueAsMapEntryValue instanceof Iterable) { // JSON Array } else if (valueAsMapEntryValue instanceof Iterable) { // JSON Array
Iterable<Object> valueAsMapEntryValueIterable = (Iterable<Object>) valueAsMapEntryValue; Iterable<Object> valueAsMapEntryValueIterable = (Iterable<Object>) valueAsMapEntryValue;
System.out.println(valueAsMapEntryValue);
String valueAsMapEntryKey = valueAsMapEntry.getKey(); String valueAsMapEntryKey = valueAsMapEntry.getKey();
int i = 0; int i = 0;
for (Object object : valueAsMapEntryValueIterable) { for (Object object : valueAsMapEntryValueIterable) {
System.out.println(valueAsMapEntryValueIterable); valueAsMap_second.put(valueAsMapEntryKey + "#" + i, object);
myNewMap.put(valueAsMapEntryKey + "#" + i, object);
//valueAsMap.putAll(myNewMap);
++i; ++i;
expandMapArrays(object); expandMapArrays(object);
System.out.println(object);
} }
} }
} }
valueAsMap.putAll(myNewMap); valueAsMap.putAll(valueAsMap_second);
} }
} }