mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page 17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x) 17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval) 17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper 17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment) 17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit) 17746: Merged V3.1 to V3.2 17290: Merged V2.2 to V3.1 17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ... 17381: (record-only) Putting explicit version name on PDFRenderer.jar 17413: (record-only) Removed dev from label 17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY 17750: Fixed propval mappings for DB2 17754: Fixed "invalid character" in Oracle port of propval 17757: Re-added fix for ETHREEOH-2789 that got lost in a merge. 17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize) 17765: Assorted minor build fixes for Oracle 17767: Empty String property values are persisted as '.empty' 17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch 17772: Fix build (JBPMEngineUnitTest) - fallout from r17765 17774: Fix JSONtoFmModelTest 17781: Build/test fix (AVMCrawlTestP) 17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports 17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ... 17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails 17807: Fix ETHREEOH-3723 - MT blocker (can't restart) 17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2 17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}') 17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect 17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str' 17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2 17862: Merged V3.1 to V3.2 17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test 17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test 17871: Merged V3.1 to V3.2 17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections) 17863: ETHREEOH-3852 - perf tweak (WCM layered files) ------------------------------------- Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758 Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814 Merged /alfresco/BRANCHES/V2.2:r17282 Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863 Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
208 lines
7.3 KiB
Java
208 lines
7.3 KiB
Java
/*
|
|
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have recieved a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing"
|
|
*/
|
|
package org.alfresco.util;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.SortedMap;
|
|
import java.util.TreeMap;
|
|
import java.util.regex.Pattern;
|
|
|
|
import org.json.JSONArray;
|
|
import org.json.JSONException;
|
|
import org.json.JSONObject;
|
|
import org.json.JSONTokener;
|
|
import org.springframework.extensions.surf.util.ISO8601DateFormat;
|
|
|
|
/**
|
|
* Utility to convert JSON to Freemarker-compatible data model
|
|
*
|
|
* @author janv
|
|
*/
|
|
public final class JSONtoFmModel
|
|
{
|
|
public static String ROOT_ARRAY = "root";
|
|
|
|
// note: current format is dependent on ISO8601DateFormat.parser, eg. YYYY-MM-DDThh:mm:ss.sssTZD
|
|
private static String REGEXP_ISO8061 = "^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]){3})?(Z|[\\+\\-]([0-9]{2}):([0-9]{2}))$";
|
|
private static Pattern matcherISO8601 = Pattern.compile(REGEXP_ISO8061);
|
|
|
|
public static boolean autoConvertISO8601 = true;
|
|
|
|
/**
|
|
* Convert JSON Object string to Freemarker-compatible data model
|
|
*
|
|
* @param jsonString
|
|
* @return model
|
|
* @throws JSONException
|
|
*/
|
|
public static Map<String, Object> convertJSONObjectToMap(String jsonString) throws JSONException
|
|
{
|
|
JSONObject jo = new JSONObject(new JSONTokener(jsonString));
|
|
return convertJSONObjectToMap(jo);
|
|
}
|
|
|
|
/**
|
|
* JSONObject is an unordered collection of name/value pairs -> convert to Map (equivalent to Freemarker "hash")
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public static Map<String, Object> convertJSONObjectToMap(JSONObject jo) throws JSONException
|
|
{
|
|
Map<String, Object> model = new HashMap<String, Object>();
|
|
|
|
Iterator<String> itr = (Iterator<String>)jo.keys();
|
|
while (itr.hasNext())
|
|
{
|
|
String key = (String)itr.next();
|
|
|
|
Object o = jo.get(key);
|
|
if (o instanceof JSONObject)
|
|
{
|
|
model.put(key, convertJSONObjectToMap((JSONObject)o));
|
|
}
|
|
else if (o instanceof JSONArray)
|
|
{
|
|
model.put(key, convertJSONArrayToList((JSONArray)o));
|
|
}
|
|
else if (o == JSONObject.NULL)
|
|
{
|
|
model.put(key, null); // note: http://freemarker.org/docs/dgui_template_exp.html#dgui_template_exp_missing
|
|
}
|
|
else
|
|
{
|
|
if ((o instanceof String) && autoConvertISO8601 && (matcherISO8601.matcher((String)o).matches()))
|
|
{
|
|
o = ISO8601DateFormat.parse((String)o);
|
|
}
|
|
|
|
model.put(key, o);
|
|
}
|
|
}
|
|
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* Convert JSON Array string to Freemarker-compatible data model
|
|
*
|
|
* @param jsonString
|
|
* @return model
|
|
* @throws JSONException
|
|
*/
|
|
public static Map<String, Object> convertJSONArrayToMap(String jsonString) throws JSONException
|
|
{
|
|
Map<String, Object> model = new HashMap<String, Object>();
|
|
JSONArray ja = new JSONArray(new JSONTokener(jsonString));
|
|
model.put(ROOT_ARRAY, convertJSONArrayToList(ja));
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* JSONArray is an ordered sequence of values -> convert to List (equivalent to Freemarker "sequence")
|
|
*/
|
|
public static List<Object> convertJSONArrayToList(JSONArray ja) throws JSONException
|
|
{
|
|
List<Object> model = new ArrayList<Object>();
|
|
|
|
for (int i = 0; i < ja.length(); i++)
|
|
{
|
|
Object o = ja.get(i);
|
|
|
|
if (o instanceof JSONArray)
|
|
{
|
|
model.add(convertJSONArrayToList((JSONArray)o));
|
|
}
|
|
else if (o instanceof JSONObject)
|
|
{
|
|
model.add(convertJSONObjectToMap((JSONObject)o));
|
|
}
|
|
else if (o == JSONObject.NULL)
|
|
{
|
|
model.add(null);
|
|
}
|
|
else
|
|
{
|
|
if ((o instanceof String) && autoConvertISO8601 && (matcherISO8601.matcher((String)o).matches()))
|
|
{
|
|
o = ISO8601DateFormat.parse((String)o);
|
|
}
|
|
|
|
model.add(o);
|
|
}
|
|
}
|
|
|
|
return model;
|
|
}
|
|
|
|
// for debugging only
|
|
public static String toString(Map<String, Object> map)
|
|
{
|
|
return JSONtoFmModel.toStringBuffer(map, 0).toString();
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
private static StringBuffer toStringBuffer(Map<String, Object> unsortedMap, int indent)
|
|
{
|
|
StringBuffer tabs = new StringBuffer();
|
|
for (int i = 0; i < indent; i++)
|
|
{
|
|
tabs.append("\t");
|
|
}
|
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
|
SortedMap<String, Object> map = new TreeMap<String, Object>();
|
|
map.putAll(unsortedMap);
|
|
|
|
for (Map.Entry<String, Object> entry : map.entrySet())
|
|
{
|
|
if (entry.getValue() instanceof Map)
|
|
{
|
|
sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue().getClass()).append("\n");
|
|
sb.append(JSONtoFmModel.toStringBuffer((Map<String, Object>)entry.getValue(), indent+1));
|
|
}
|
|
else if (entry.getValue() instanceof List)
|
|
{
|
|
sb.append(tabs).append("[\n");
|
|
List l = (List)entry.getValue();
|
|
for (int i = 0; i < l.size(); i++)
|
|
{
|
|
sb.append(tabs).append(l.get(i)).append(":").append((l.get(i) != null) ? l.get(i).getClass() : "null").append("\n");
|
|
}
|
|
sb.append(tabs).append("]\n");
|
|
}
|
|
else
|
|
{
|
|
sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue()).append(":").append((entry.getValue() != null ? entry.getValue().getClass() : "null")).append("\n");
|
|
}
|
|
}
|
|
|
|
return sb;
|
|
}
|
|
}
|