Skip to content

Commit

Permalink
Refactoring (googleapis#490)
Browse files Browse the repository at this point in the history
  • Loading branch information
@geri-m
geri-m committed Oct 27, 2018
1 parent 2a711f2 commit e181f3b
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 81 deletions.
26 changes: 24 additions & 2 deletions google-http-client-xml/src/main/java/com/google/api/client/xml/DedicatedObjectParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.google.api.client.xml;

import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.xmlpull.v1.XmlPullParserException;
import com.google.api.client.util.ClassInfo;
import com.google.api.client.util.FieldInfo;
import com.google.api.client.util.Types;

public class DedicatedObjectParser extends Xml<Field> {

Expand Down Expand Up @@ -100,8 +103,27 @@ public void mapCollection(final Class<?> fieldClass, final String fieldName, fin
}

@Override
public void mapArrayWithClassTypeSetValue(final Object destination, final Object value){
setValue(destination, value);
public boolean mapArrayWithClassType(final ParserParameter parameter,
final Field field, final String fieldName,
final Type fieldType, final Class<?> fieldClass)
throws IOException, XmlPullParserException {
final boolean isStopped; // not an array/iterable or a map, but we do have a field
Object value = Types.newInstance(fieldClass);
int contextSize = parameter.context.size();
parameter.context.add(fieldType);
isStopped = Xml.parseElementInternal(new ParserParameter(parameter.parser,
parameter.context,
value, // destination; never null.
null,
parameter.namespaceDictionary,
parameter.customizeParser));
parameter.context.remove(contextSize);

// mapArrayWithClassTypeSetValue(parameter.destination, value);

setValue(parameter.destination, value);

return isStopped;
}

}
9 changes: 7 additions & 2 deletions google-http-client-xml/src/main/java/com/google/api/client/xml/GenericXmlParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.google.api.client.xml;

import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import com.google.api.client.util.ClassInfo;

public class GenericXmlParser extends Xml<GenericXml> {
Expand Down Expand Up @@ -102,8 +104,11 @@ public void mapCollection(final Class<?> fieldClass, final String fieldName, fin


@Override
public void mapArrayWithClassTypeSetValue(final Object fieldName, final Object value){
setValue(fieldName, value);
public boolean mapArrayWithClassType(final ParserParameter parameter,
final Field field, final String fieldName,
final Type fieldType, final Class<?> fieldClass)
{
throw new RuntimeException("No mapArrayWithClassType in GenericXml");
}

}
10 changes: 4 additions & 6 deletions google-http-client-xml/src/main/java/com/google/api/client/xml/MapParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,13 @@ public void mapCollection(final Class<?> fieldClass, final String fieldName, fin
destinationMap.put(fieldName, list);
}
list.add(mapValue);


}


@Override
public void mapArrayWithClassTypeSetValue(final Object fieldName, final Object value) {
setValue(fieldName, value);
public boolean mapArrayWithClassType(final ParserParameter parameter,
final Field field, final String fieldName,
final Type fieldType, final Class<?> fieldClass) {
throw new RuntimeException("No mapArrayWithClassType in MapParser");
}


}
101 changes: 30 additions & 71 deletions google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ protected Xml(final ParserParameter parameter) {

public abstract void mapCollection(final Class<?> fieldClass, final String fieldName, final Map<String, Object> mapValue);

public abstract void mapArrayWithClassTypeSetValue(final Object destination, final Object value);
public abstract boolean mapArrayWithClassType(final ParserParameter parameter,
final Field field, final String fieldName,
final Type fieldType, final Class<?> fieldClass) throws IOException, XmlPullParserException;

/**
* {@code "application/xml; charset=utf-8"} media type used as a default for XML parsing.
Expand Down Expand Up @@ -233,7 +235,7 @@ public ParserParameter(XmlPullParser parser,
* @throws XmlPullParserException
*/

private static boolean parseElementInternal(final ParserParameter parameter)
protected static boolean parseElementInternal(final ParserParameter parameter)
throws IOException, XmlPullParserException {
// TODO(yanivi): method is too long; needs to be broken down into smaller methods and comment
// better
Expand Down Expand Up @@ -296,11 +298,9 @@ private static boolean parseElementInternal(final ParserParameter parameter)
if ((parser instanceof DedicatedObjectParser)) {
parser.setDestination(field);
}

sanityCheck(parser, field);
parser.sanityCheck(parser, field);
parameter.valueType = field == null ? parameter.valueType : field.getGenericType();

mapTextToElementValue(parameter, parser, field, TEXT_CONTENT);
parser.mapTextToElementValue(parameter, field, TEXT_CONTENT);
}
break;
case XmlPullParser.START_TAG:
Expand Down Expand Up @@ -365,7 +365,7 @@ private static boolean parseElementInternal(final ParserParameter parameter)
case XmlPullParser.TEXT:
if (!ignore && level == 1) {
parameter.valueType = field == null ? parameter.valueType : field.getGenericType();
sanityCheck(parser, field);
parser.sanityCheck(parser, field);

if (field == null) {
throw new RuntimeException("Field can not be null here");
Expand Down Expand Up @@ -418,15 +418,6 @@ private static boolean parseElementInternal(final ParserParameter parameter)
throw new RuntimeException("Field can not be null here. ");
// if field would be null, we have to pass the destination Map; not sure how such a case looks like yet
}

if (parser instanceof MapParser) {
throw new RuntimeException("MapParser");
}

if (parser instanceof GenericXmlParser) {
throw new RuntimeException("GenericXmlParser");
}

// done.
isStopped = parser.mapArrayWithClassType(parameter, field, fieldName, fieldType,
fieldClass);
Expand Down Expand Up @@ -460,53 +451,22 @@ private static boolean parseElementInternal(final ParserParameter parameter)
return isStopped;
}

private static void sanityCheck(final Xml parser, final Field field) {
private void sanityCheck(final Xml parser, final Field field) {
if (field != null && !(parser instanceof DedicatedObjectParser)) {
throw new RuntimeException("Incorrect Parser");
}
}

private static void mapTextToElementValue(final ParserParameter parameter, final Xml parser, final Field field, final String textContent) {
private void mapTextToElementValue(final ParserParameter parameter, final Field field, final String textContent) {
if (field != null) {
if (!(parser instanceof DedicatedObjectParser)) {
if (!(this instanceof DedicatedObjectParser)) {
throw new RuntimeException("DedicatedObjectParser required");
}
parser.parseAttributeOrTextContent(parameter.parser.getText(), parameter.destination);
parseAttributeOrTextContent(parameter.parser.getText(), parameter.destination);
} else {
parser.parseAttributeOrTextContent(parameter.parser.getText(), textContent);
}
}

// done
private boolean mapAsClassOrObjectType(final ParserParameter parameter, final String fieldName,
final Type fieldType, final Class<?> fieldClass)
throws IOException, XmlPullParserException {
final boolean isStopped; // store the element as a map
Map<String, Object> mapValue = Data.newMapInstance(fieldClass);
int contextSize = parameter.context.size();
if (fieldType != null) {
parameter.context.add(fieldType);
}

Type subValueType = fieldType != null && Map.class.isAssignableFrom(fieldClass)
? Types.getMapValueParameter(fieldType) : null;
subValueType = Data.resolveWildcardTypeOrTypeVariable(parameter.context, subValueType);
isStopped = parseElementInternal(new ParserParameter(parameter.parser,
parameter.context,
mapValue, // destination; never null
subValueType,
parameter.namespaceDictionary,
parameter.customizeParser));
if (fieldType != null) {
parameter.context.remove(contextSize);
parseAttributeOrTextContent(parameter.parser.getText(), textContent);
}

mapCollection(fieldClass, fieldName, mapValue);

// Handle as Array
return isStopped;
}

private static boolean mapAsArrayOrCollection(final XmlPullParser parser,
final ArrayList<Type> context,
final Object destination,
Expand Down Expand Up @@ -605,36 +565,35 @@ private static boolean mapAsArrayOrCollection(final XmlPullParser parser,
return isStopped;
}
// -----------------------------------------------------------------
// done.
private boolean mapArrayWithClassType(final ParserParameter parameter,
final Field field, final String fieldName,
final Type fieldType, final Class<?> fieldClass)

private boolean mapAsClassOrObjectType(final ParserParameter parameter, final String fieldName,
final Type fieldType, final Class<?> fieldClass)
throws IOException, XmlPullParserException {
final boolean isStopped; // not an array/iterable or a map, but we do have a field
Object value = Types.newInstance(fieldClass);
final boolean isStopped; // store the element as a map
Map<String, Object> mapValue = Data.newMapInstance(fieldClass);
int contextSize = parameter.context.size();
parameter.context.add(fieldType);
if (fieldType != null) {
parameter.context.add(fieldType);
}

Type subValueType = fieldType != null && Map.class.isAssignableFrom(fieldClass)
? Types.getMapValueParameter(fieldType) : null;
subValueType = Data.resolveWildcardTypeOrTypeVariable(parameter.context, subValueType);
isStopped = parseElementInternal(new ParserParameter(parameter.parser,
parameter.context,
value, // destination; never null.
null,
mapValue, // destination; never null
subValueType,
parameter.namespaceDictionary,
parameter.customizeParser));
parameter.context.remove(contextSize);


if (field != null) {
mapArrayWithClassTypeSetValue(parameter.destination, value);
} else {
// we never end up here?
mapArrayWithClassTypeSetValue(fieldName, value);
if (fieldType != null) {
parameter.context.remove(contextSize);
}

mapCollection(fieldClass, fieldName, mapValue);
// Handle as Array
return isStopped;
}



protected static String getFieldName(
boolean isAttribute, String alias, String name) {
if (!isAttribute && alias.length() == 0) {
Expand Down

0 comments on commit e181f3b

Please sign in to comment.