/ - Diff - D-Net - D-Net project tracking tool

     package eu.dnetlib.pace.model.gt;
     import org.apache.commons.lang.StringUtils;
     import com.google.gson.Gson;
     public class CoAuthor extends Author {
-...
     		super(author);
+    	}
     	public boolean hasAnchorId() {
     		return StringUtils.isNotBlank(getAnchorId());
+    	}
     	public String getAnchorId() {
     		return anchorId;
+    	}

     public class GTAuthorOafSerialiser implements JsonDeserializer<GTAuthor> {
     	private static final String VALUE = "value";
     	private static final String SECONDNAMES = "secondnames";
     	private static final String FIRSTNAME = "firstname";
     	private static final String FULLNAME = "fullname";
     	private static final String ID = "id";
     	private static final String MERGEDPERSON = "mergedperson";
     	private static final String METADATA = "metadata";
     	private static final String ANCHOR_ID = "anchorId";
     	private static final String COAUTHOR = "coauthor";
     	@Override
     	public GTAuthor deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
     		final GTAuthor gta = new GTAuthor();
-...
+    	}
     	private CoAuthors getCoAuthors(final JsonElement json) {
     		return new CoAuthors(Lists.newArrayList(Iterables.transform(json.getAsJsonObject().get("coauthor").getAsJsonArray(),
     		final JsonObject obj = json.getAsJsonObject();
     		if (!obj.has(COAUTHOR)) return null;
     		return new CoAuthors(Lists.newArrayList(Iterables.transform(obj.get(COAUTHOR).getAsJsonArray(),
     				new Function<JsonElement, CoAuthor>() {
     					@Override
     					public CoAuthor apply(final JsonElement in) {
     						final CoAuthor a = new CoAuthor(getAuthor(in));
     						final JsonObject jsonObject = in.getAsJsonObject();
     						if (jsonObject.has("anchorId")) {
     							a.setAnchorId(jsonObject.get("anchorId").getAsString());
     						if (jsonObject.has(ANCHOR_ID)) {
     							a.setAnchorId(jsonObject.get(ANCHOR_ID).getAsString());
+    						}
     						return a;
+    					}
-...
     		final JsonObject jso = json.getAsJsonObject();
     		a.setId(jso.has("id") ? jso.get("id").getAsString() : null);
     		a.setId(jso.has(ID) ? jso.get(ID).getAsString() : null);
     		final JsonObject m = json.getAsJsonObject().get("metadata").getAsJsonObject();
     		a.setFullname(getValue(m, "fullname"));
     		a.setFirstname(getValue(m, "firstname"));
     		a.setSecondnames(getValues(m, "secondnames"));
     		final JsonObject jsonObject = json.getAsJsonObject();
     		if (jsonObject.has(METADATA)) {
     			final JsonObject m = jsonObject.get(METADATA).getAsJsonObject();
     			a.setFullname(getValue(m, FULLNAME));
     			a.setFirstname(getValue(m, FIRSTNAME));
     			a.setSecondnames(getValues(m, SECONDNAMES));
+    		}
     		return a;
+    	}
     	private Authors getMerged(final JsonElement json) {
     		return new Authors(Lists.newArrayList(Iterables.transform(json.getAsJsonObject().get("mergedperson").getAsJsonArray(),
     		final JsonObject obj = json.getAsJsonObject();
     		if (!obj.has(MERGEDPERSON)) return null;
     		return new Authors(Lists.newArrayList(Iterables.transform(obj.get(MERGEDPERSON).getAsJsonArray(),
     				new Function<JsonElement, Author>() {
     					@Override
-...
     			@Override
     			public String apply(final JsonElement in) {
     				return in.getAsJsonObject().get("value").getAsString();
     				return in.getAsJsonObject().get(VALUE).getAsString();
+    			}
     		})) : null;
+    	}
     	private String getValue(final JsonObject m, final String fieldName) {
     		return m.has(fieldName) ? m.get(fieldName).getAsJsonObject().get("value").getAsString() : null;
     		return m.has(fieldName) ? m.get(fieldName).getAsJsonObject().get(VALUE).getAsString() : null;
+    	}
+    }

     	public GTAuthor(final String id, final Authors merged, final CoAuthors coAuthors, final boolean anchor) {
     		super();
     		if ((merged == null) || merged.isEmpty())
     			throw new IllegalArgumentException("empty merged author set, id: " + id);
     		this.author = pickAuthor(merged);
     		this.id = id;
     		this.merged = merged;
-...
     		this.author = author;
+    	}
     	public boolean hasMerged() {
     		return (getMerged() != null) && !getMerged().isEmpty();
+    	}
     	public Authors getMerged() {
     		return merged;
+    	}
-...
     		this.merged = merged;
+    	}
     	public boolean hasCoAuthors() {
     		return (getCoAuthors() != null) && !getCoAuthors().isEmpty();
+    	}
     	public CoAuthors getCoAuthors() {
     		return coAuthors;
+    	}

     package eu.dnetlib.pace.distance;
     import java.util.HashSet;
     import java.util.Set;
     import com.google.common.base.Function;
-...
+    	}
     	private Set<String> getAnchorIds(final CoAuthors ca) {
     		return Sets.newHashSet(Iterables.filter(Iterables.transform(ca, new Function<CoAuthor, String>() {
     		if ((ca == null) || ca.isEmpty()) return new HashSet<String>();
     		final Iterable<String> anchorIds = Iterables.transform(ca, new Function<CoAuthor, String>() {
     			@Override
     			public String apply(final CoAuthor c) {
     				return c.getAnchorId();
+    			}
     		}), Predicates.notNull()));
     		});
     		final Iterable<String> filtered = Iterables.filter(anchorIds, Predicates.notNull());
     		return Sets.newHashSet(filtered);
+    	}
     	private Set<String> getSurnames(final CoAuthors ca) {
     		if ((ca == null) || ca.isEmpty()) return new HashSet<String>();
     		return Sets.newHashSet(Iterables.filter(Iterables.transform(ca, new Function<CoAuthor, String>() {
     			@Override

Project

General

Profile

D-Net

Revision 38362

Added by Claudio Atzori about 9 years ago