Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for ERXCryptoString to ERRest when the content type is JSON #519

Merged
merged 1 commit into from
Dec 9, 2013
Merged

Add support for ERXCryptoString to ERRest when the content type is JSON #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Frameworks/EOF/ERRest/Sources/er/rest/ERXRestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.webobjects.foundation.NSTimestampFormatter;
import com.webobjects.foundation._NSUtilities;

import er.extensions.crypting.ERXCryptoString;
import er.extensions.foundation.ERXProperties;
import er.extensions.foundation.ERXValueUtilities;

Expand Down Expand Up @@ -101,6 +102,9 @@ else if (Enum.class.isAssignableFrom(valueType)) {
else if (NSKeyValueCoding.Null.class.isAssignableFrom(valueType)) {
primitive = true;
}
else if (ERXCryptoString.class.isAssignableFrom(valueType)) {
primitive = true;
}
return primitive;
}

Expand Down Expand Up @@ -407,6 +411,9 @@ else if (valueType != null && LocalDate.class.isAssignableFrom(valueType)) {
else if (valueType != null && Enum.class.isAssignableFrom(valueType)) {
parsedValue = ERXValueUtilities.enumValueWithDefault(value, (Class<? extends Enum>) valueType, null);
}
else if (valueType != null && ERXCryptoString.class.isAssignableFrom(valueType)) {
parsedValue = new ERXCryptoString(value.toString());
}
else if (resolveEntities) {
EOClassDescription entity = ERXRestClassDescriptionFactory.classDescriptionForEntityName(valueTypeName);
if (entity != null) {
Expand Down
66 changes: 10 additions & 56 deletions Frameworks/EOF/ERRest/Sources/er/rest/format/_ERXJSONConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.webobjects.foundation.NSData;
import com.webobjects.foundation.NSTimestamp;

import er.extensions.crypting.ERXCryptoString;
import er.rest.ERXRestContext;
import er.rest.ERXRestUtils;

Expand All @@ -29,45 +30,13 @@ public Object getMatch(@SuppressWarnings("rawtypes") Class target, @SuppressWarn
}
}

public static class NSTimestampProcessor implements JsonValueProcessor {
public static class GeneralObjectToStringProcessor implements JsonValueProcessor {
private ERXRestContext _context;

public NSTimestampProcessor(ERXRestContext context) {
_context = context;
}

public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}

public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}
}

public static class NSDataProcessor implements JsonValueProcessor {
private ERXRestContext _context;

public NSDataProcessor(ERXRestContext context) {
public GeneralObjectToStringProcessor(ERXRestContext context) {
_context = context;
}

public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}

public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}
}

public static class JodaTimeProcessor implements JsonValueProcessor {
private ERXRestContext _context;

public JodaTimeProcessor(ERXRestContext context) {
_context = context;
}

public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}
Expand All @@ -76,32 +45,17 @@ public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}
}

public static class JodaDateTimeProcessor implements JsonValueProcessor {
private ERXRestContext _context;

public JodaDateTimeProcessor(ERXRestContext context) {
_context = context;
}

public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}

public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
return ERXRestUtils.coerceValueToString(obj, _context);
}
}

public static JsonConfig createDefaultConfig(ERXRestContext context) {
JsonConfig config = new JsonConfig();
config.registerJsonValueProcessor(NSTimestamp.class, new NSTimestampProcessor(context));
config.registerJsonValueProcessor(LocalDate.class, new JodaTimeProcessor(context));
config.registerJsonValueProcessor(LocalDateTime.class, new JodaDateTimeProcessor(context));
config.registerJsonValueProcessor(Date.class, new NSTimestampProcessor(context));
config.registerJsonValueProcessor(NSData.class, new NSDataProcessor(context));
config.registerJsonValueProcessor(NSTimestamp.class, new GeneralObjectToStringProcessor(context));
config.registerJsonValueProcessor(LocalDate.class, new GeneralObjectToStringProcessor(context));
config.registerJsonValueProcessor(LocalDateTime.class, new GeneralObjectToStringProcessor(context));
config.registerJsonValueProcessor(Date.class, new GeneralObjectToStringProcessor(context));
config.registerJsonValueProcessor(NSData.class, new GeneralObjectToStringProcessor(context));
config.registerJsonValueProcessor(ERXCryptoString.class, new GeneralObjectToStringProcessor(context));
config.setJsonValueProcessorMatcher(new ERXRestValueProcessorMatcher());
return config;
}

}