You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ie...@apache.org on 2008/07/20 11:49:37 UTC
svn commit: r678263 - in /incubator/shindig/trunk/java/social-api/src:
main/java/org/apache/shindig/social/opensocial/util/
test/java/org/apache/shindig/social/opensocial/util/
Author: ieb
Date: Sun Jul 20 02:49:36 2008
New Revision: 678263
URL: http://svn.apache.org/viewvc?rev=678263&view=rev
Log:
SHINDIG-451
Renamed all classes like API* to Api* and all JSON* to Json*
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java
- copied, changed from r678158, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONLibConverterUtils.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java
- copied, changed from r678158, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONObjectToMapMorpher.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java
- copied, changed from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidator.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorExpcetion.java
- copied, changed from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorExpcetion.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorTest.java
- copied, changed from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorTest.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONLibConverterUtils.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONObjectToMapMorpher.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidator.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorExpcetion.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java?rev=678263&r1=678262&r2=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java Sun Jul 20 02:49:36 2008
@@ -77,7 +77,7 @@
.registerMorpher(new EnumMorpher(Enum.NetworkPresence.class));
morpherRegistry.registerMorpher(new EnumMorpher(Enum.Smoker.class));
- morpherRegistry.registerMorpher(new JSONObjectToMapMorpher());
+ morpherRegistry.registerMorpher(new JsonObjectToMapMorpher());
}
@Inject
@@ -92,7 +92,7 @@
if (string.startsWith("[")) {
JSONArray jsonArray = JSONArray.fromObject(string, jsonConfig);
if (debugMode) {
- JSONLibConverterUtils.dumpJsonArray(jsonArray, " ");
+ JsonLibConverterUtils.dumpJsonArray(jsonArray, " ");
}
if (rootBeanClass.isArray()) {
@@ -114,7 +114,7 @@
JSONObject jsonObject = JSONObject.fromObject(string, jsonConfig);
if (debugMode) {
- JSONLibConverterUtils.dumpJsonObject(jsonObject, " ");
+ JsonLibConverterUtils.dumpJsonObject(jsonObject, " ");
}
T rootObject = injector.getInstance(rootBeanClass);
Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java (from r678158, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONLibConverterUtils.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONLibConverterUtils.java&r1=678158&r2=678263&rev=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONLibConverterUtils.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java Sun Jul 20 02:49:36 2008
@@ -26,9 +26,9 @@
/**
*
*/
-public class JSONLibConverterUtils {
+public class JsonLibConverterUtils {
protected static final Log log = LogFactory
- .getLog(JSONLibConverterUtils.class);
+ .getLog(JsonLibConverterUtils.class);
/**
Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java (from r678158, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONObjectToMapMorpher.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONObjectToMapMorpher.java&r1=678158&r2=678263&rev=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JSONObjectToMapMorpher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java Sun Jul 20 02:49:36 2008
@@ -27,7 +27,7 @@
/**
*
*/
-public class JSONObjectToMapMorpher implements Morpher, ObjectMorpher {
+public class JsonObjectToMapMorpher implements Morpher, ObjectMorpher {
public Class<?> morphsTo() {
return Map.class;
Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java (from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidator.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidator.java&r1=678158&r2=678263&rev=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidator.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java Sun Jul 20 02:49:36 2008
@@ -45,9 +45,9 @@
* A class that loads a feature set from features into a Javascript Parser to
* make the model available to validate JSON messages against.
*/
-public class APIValidator {
+public class ApiValidator {
- private static final Log log = LogFactory.getLog(APIValidator.class);
+ private static final Log log = LogFactory.getLog(ApiValidator.class);
private Context ctx;
private ScriptableObject scope;
@@ -65,7 +65,7 @@
* feature is missing
*
*/
- public APIValidator(String feature) throws IOException,
+ public ApiValidator(String feature) throws IOException,
ParserConfigurationException, SAXException {
ctx = Context.enter();
scope = ctx.initStandardObjects();
@@ -83,7 +83,7 @@
* If any of the fields that appear in the json structure are
* optional, then they should be defined in this parameter.
* @param nullfields
- * @throws APIValidatorExpcetion
+ * @throws ApiValidatorExpcetion
* if there is a problem validating the json
* @return a map so string object pairs containing the fields at the top level
* of the json tree. Where these are native java objects, they will
@@ -92,7 +92,7 @@
*/
public Map<String, Object> validate(String json, String object,
String[] optionalFields, String[] nullfields)
- throws APIValidatorExpcetion {
+ throws ApiValidatorExpcetion {
/*
* Object[] ids = ScriptableObject.getPropertyIds(scope); for (Object id :
@@ -131,11 +131,11 @@
* @param string
* @param optional
* @return
- * @throws APIValidatorExpcetion
+ * @throws ApiValidatorExpcetion
*/
public Map<String, Object> validateOject(Object jsonObject, String object,
String[] optionalFields, String[] nullFields)
- throws APIValidatorExpcetion {
+ throws ApiValidatorExpcetion {
Map<String, String> optional = new HashMap<String, String>();
for (String opt : optionalFields) {
optional.put(opt, opt);
@@ -164,7 +164,7 @@
log.warn("Missing Optional Field " + fieldName);
} else if (!nullf.containsKey(fieldName)) {
log.error("Missing Field " + fieldName);
- throw new APIValidatorExpcetion("Missing Field " + fieldName);
+ throw new ApiValidatorExpcetion("Missing Field " + fieldName);
}
} else {
if (nullf.containsKey(fieldName)) {
@@ -187,7 +187,7 @@
}
} else {
- throw new APIValidatorExpcetion(
+ throw new ApiValidatorExpcetion(
"Parsing JSON resulted in invalid Javascript object, which was "
+ jsonObject + " JSON was [[" + jsonObject + "]]");
}
Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorExpcetion.java (from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorExpcetion.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorExpcetion.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorExpcetion.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorExpcetion.java&r1=678158&r2=678263&rev=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorExpcetion.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorExpcetion.java Sun Jul 20 02:49:36 2008
@@ -20,22 +20,22 @@
/**
* Thrown when there is a validation exception on one of the apis
*/
-public class APIValidatorExpcetion extends Exception {
+public class ApiValidatorExpcetion extends Exception {
private static final long serialVersionUID = -8969858718669454612L;
- public APIValidatorExpcetion() {
+ public ApiValidatorExpcetion() {
}
- public APIValidatorExpcetion(String message) {
+ public ApiValidatorExpcetion(String message) {
super(message);
}
- public APIValidatorExpcetion(Throwable cause) {
+ public ApiValidatorExpcetion(Throwable cause) {
super(cause);
}
- public APIValidatorExpcetion(String message, Throwable cause) {
+ public ApiValidatorExpcetion(String message, Throwable cause) {
super(message, cause);
}
Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorTest.java (from r678158, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorTest.java&r1=678158&r2=678263&rev=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/APIValidatorTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidatorTest.java Sun Jul 20 02:49:36 2008
@@ -30,7 +30,7 @@
/**
* Test the api validator to make certain it behaves as is expected.
*/
-public class APIValidatorTest {
+public class ApiValidatorTest {
/**
* A definition of the test json used in this unit test.
@@ -40,14 +40,14 @@
/**
* test the validator for successful validation
- * @throws APIValidatorExpcetion
+ * @throws ApiValidatorExpcetion
* @throws IOException
* @throws ParserConfigurationException
* @throws SAXException
*/
@Test
- public void testValidator() throws APIValidatorExpcetion, IOException, ParserConfigurationException, SAXException {
- APIValidator apiVal = new APIValidator("opensocial-reference");
+ public void testValidator() throws ApiValidatorExpcetion, IOException, ParserConfigurationException, SAXException {
+ ApiValidator apiVal = new ApiValidator("opensocial-reference");
apiVal.addScript(TEST_DEFINITION);
String[] optional = {"shouldBeMissing"};
String[] nullfields = {};
@@ -65,21 +65,21 @@
/**
* Test for a failing validation
- * @throws APIValidatorExpcetion
+ * @throws ApiValidatorExpcetion
* @throws IOException
* @throws ParserConfigurationException
* @throws SAXException
*/
@Test
- public void testValidatorFail() throws APIValidatorExpcetion, IOException, ParserConfigurationException, SAXException {
- APIValidator apiVal = new APIValidator("opensocial-reference");
+ public void testValidatorFail() throws ApiValidatorExpcetion, IOException, ParserConfigurationException, SAXException {
+ ApiValidator apiVal = new ApiValidator("opensocial-reference");
apiVal.addScript(TEST_DEFINITION);
String[] optional = {};
String[] nullfields = {};
try {
apiVal.validate("{ jsonIsMissing: \"A Test JSON\", xyz : 123 }", "TestDef.Field", optional, nullfields );
Assert.fail("Should have Generated an APIValidatorException ");
- } catch ( APIValidatorExpcetion ex ) {
+ } catch ( ApiValidatorExpcetion ex ) {
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=678263&r1=678262&r2=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java Sun Jul 20 02:49:36 2008
@@ -53,7 +53,7 @@
private Activity activity;
private BeanJsonLibConverter beanJsonConverter;
- private APIValidator apiValidator;
+ private ApiValidator apiValidator;
// set to true to get loging output at info level
private boolean outputInfo = false;
@@ -80,7 +80,7 @@
beanJsonConverter = new BeanJsonLibConverter(Guice
.createInjector(new JsonLibTestsGuiceModule()));
- apiValidator = new APIValidator("opensocial-reference");
+ apiValidator = new ApiValidator("opensocial-reference");
}
@@ -154,10 +154,10 @@
/**
* @param result
- * @throws APIValidatorExpcetion
+ * @throws ApiValidatorExpcetion
*/
private void validatePerson(String result, String id, String name, String[] optional, String[] nullfields)
- throws APIValidatorExpcetion {
+ throws ApiValidatorExpcetion {
Map<String, Object> standard = apiValidator.validate(result,
"opensocial.Person.Field", optional,nullfields);
@@ -168,7 +168,7 @@
assertNotNull(standard.get("name"));
Map<String, Object> nameJSON = apiValidator.validateOject(standard
.get("name"), "opensocial.Name.Field", optional,nullfields);
- APIValidator.dump(nameJSON);
+ ApiValidator.dump(nameJSON);
assertNotNull(nameJSON.get("unstructured"));
assertEquals(String.class, nameJSON.get("unstructured").getClass());
@@ -275,7 +275,7 @@
if (outputInfo) {
log.info("Dumping Map (" + parsedMap + ")");
}
- APIValidator.dump(parsedMap);
+ ApiValidator.dump(parsedMap);
assertEquals("1", ((Map<?,?>)parsedMap.get("item1")).get("value"));
assertEquals("2", ((Map<?,?>)parsedMap.get("item2")).get("value"));
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=678263&r1=678262&r2=678263&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java Sun Jul 20 02:49:36 2008
@@ -50,7 +50,7 @@
private Activity activity;
private BeanJsonLibConverter beanJsonLibConverter;
- private APIValidator apiValidator;
+ private ApiValidator apiValidator;
// set to true to get loging output at info level
private boolean outputInfo = false;
private BeanJsonConverter beanJsonConverter;
@@ -81,7 +81,7 @@
beanJsonConverter = new BeanJsonConverter(Guice
.createInjector(new SocialApiTestsGuiceModule()));
- apiValidator = new APIValidator("opensocial-reference");
+ apiValidator = new ApiValidator("opensocial-reference");
}