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

     					+ "{ relType = projectOrganization_participation_isParticipant, targetEntity = project, expandAs = rel, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }, "
     					+ "{ relType = datasourceOrganization_provision_isProvidedBy, targetEntity = datasource, expandAs = rel, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }, "
     					+ "{ relType = organizationOrganization_dedup_merges, targetEntity = organization, expandAs = child, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }, "
     					+ "{ relType = organizationOrganization_dedup_isMergedIn, targetEntity = organization, expandAs = child, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }"
     					+ "{ relType = organizationOrganization_dedup_isMergedIn, targetEntity = organization, expandAs = child, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }, "
     					+ "{ relType = resultOrganization_affiliation_isAuthorInstitutionOf, targetEntity = result, expandAs = rel, symmetric = true, fields = [legalname,legalshortname,websiteurl,country] }"
     					+ "]}, "
     					+ "project { dups = false, links = ["
     					+ "{ relType = projectOrganization_participation_hasParticipant, targetEntity = organization, expandAs = rel, symmetric = true, fields = [code,acronym,title,websiteurl,contracttype,fundingtree] }, "
     					+ "{ relType = resultProject_outcome_produces, targetEntity = result, expandAs = rel, symmetric = true, fields = [code,acronym,title,websiteurl,contracttype,fundingtree] }, "
     					+ "{ relType = projectPerson_contactPerson_hasContact, targetEntity = person, expandAs = rel, symmetric = true, fields = [code,acronym,title,websiteurl,contracttype,fundingtree] } "
     					+ "]}} ";
     					+ "], excludeFields = [jsonextrainfo,optional1,optional2]}} ";
     	public static final String configWithIncludesExcludes =
     			"index.conf { "
     					+ "result { dups = true, links = ["
     					+ "{ relType = resultResult_dedup_isMergedIn, targetEntity = result, expandAs = child, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,pid] }, "
     					+ "{ relType = resultResult_dedup_merges, targetEntity = result, expandAs = child, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,pid] }, "
     					+ "{ relType = resultResult_publicationDataset_isRelatedTo, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,pid,url,collectedfrom] },"
     					+ "{ relType = resultResult_similarity_isAmongTopNSimilarDocuments, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid] },"
     					+ "{ relType = resultResult_similarity_hasAmongTopNSimilarDocuments, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid] },"
     					+ "{ relType = resultResult_supplement_isSupplementTo, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid,url,collectedfrom] },"
     					+ "{ relType = resultResult_supplement_isSupplementedBy, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid,url,collectedfrom] },"
     					+ "{ relType = resultResult_part_isPartOf, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid,url] },"
     					+ "{ relType = resultResult_part_hasPart, targetEntity = result, expandAs = rel, symmetric = true, fields = [title,dateofacceptance,publisher,resulttype,similarity,type,pid,url] }"
     					+ "], excludeFields = [jsonextrainfo] }, "
     					+ "person { dups = false, links = ["
     					+ "{ relType = personResult_authorship_isAuthorOf, targetEntity = result, expandAs = rel, symmetric = true, fields = [fullname,ranking,pid], max = 2 }, "
     					+ "{ relType = projectPerson_contactPerson_isContact, targetEntity = project, expandAs = rel, symmetric = true, fields = [fullname,email,fax,phone] } "
     					+ "], includeFields=[fullname, ranking]}"
     					+ "}";
     	public static final String wrongConfig =
     			"index.conf { "
     					+ "person { dups = false, links = ["
     					+ "{ relType = personResult_authorship_isAuthorOf, targetEntity = result, expandAs = rel, symmetric = true, fields = [fullname,ranking,pid], max = 2 }, "
     					+ "{ relType = projectPerson_contactPerson_isContact, targetEntity = project, expandAs = rel, symmetric = true, fields = [fullname,email,fax,phone] } "
     					+ "], includeFields=[fullname, ranking], excludeFields=[email] }"
     					+ "}";
     	public static final String context = "[{id:'egi', label:'EGI', element:'context'}, "
     			+ "{id:'egi::classification', label:'EGI classification scheme', element:'category'}, "
     			+ "{id:'egi::classification::natsc', label:'Natural Sciences', element:'concept'}, "
-...
     				assertNotNull(relDescriptor.getRelType());
     				assertNotNull(relDescriptor.getSubRelType());
     				// System.out.println(ld);
     				System.out.println(ld);
+    			}
+    		}
+    	}
     	@Test
     	public void testLoadEntityConfTableIncludeExclude() {
     		final IndexConfig conf = IndexConfig.load(configWithIncludesExcludes);
     		final EntityConfigTable map = conf.getConfigMap();
     		assertNotNull(map);
     		assertTrue(map.size() > 0);
     		assertTrue(map.hasIncludeFields(Type.person));
     		assertTrue(map.hasExcludeFields(Type.result));
+    	}
     	@Test(expected = RuntimeException.class)
     	public void testBothIncludeExclude() {
     		final IndexConfig conf = IndexConfig.load(wrongConfig);
     		final EntityConfigTable map = conf.getConfigMap();
+    	}
+    }

     		doTest(loadFromTransformationProfile("projects_2_hbase.xsl"), load("projectRecordFCT.xml"));
+    	}
     	@Test
     	public void testParseOaf() throws Exception {
-...
+    	}
     	@Test
     	public void testLinkOrganizationAffiliation() throws Exception {
     		final List<Row> rows = Lists.newArrayList();
     		rows.addAll(asRows(loadFromTransformationProfile("organizations_2_hbase.xsl"), load("organization.xml")));
     		rows.addAll(asRows(loadFromTransformationProfile("resultorganization_2_hbase.xsl"), load("result_organization.xml")));
     		rows.addAll(asRows(loadFromTransformationProfile("oaf2hbase.xml"), load("record.xml")));
     		printAll(mapAll(buildTable(rows)));
+    	}
     	@Test
     	public void testUnpackAuthors() throws Exception {
     		final Map<String, Object> xslParams = Maps.newHashMap();
-...
     	@Test
     	public void testProjectExtraInfo() throws Exception {
     		final List<Row> rows = Lists.newArrayList();
     		rows.addAll(asRows(loadFromTransformationProfile("projects_2_hbase.xsl"), load("projectRecordExtraInfo.xml")));
     		printAll(mapAll(buildTable(rows)));
-...
     						log.debug(doc.valueOf(xpath));
+    					}
     				} else {
     					log.info(val);
+    				}
+    			}
-...
+    	}
     	private XmlRecordFactory newBuilder() throws TransformerConfigurationException, TransformerFactoryConfigurationError, DocumentException {
     		return new XmlRecordFactory(entityConfigTable, ContextMapper.fromXml(eu.dnetlib.data.mapreduce.hbase.index.config.Context.xml),
     				RelClasses.fromJSon(RelClassesTest.relClassesJson), XmlRecordFactoryTest.SCHEMA_LOCATION, true, true, false, XmlRecordFactoryTest.specialDatasourceTypes);
     		return new XmlRecordFactory(entityConfigTable, ContextMapper.fromXml(Context.xml),
     				RelClasses.fromJSon(RelClassesTest.relClassesJson), XmlRecordFactoryTest.SCHEMA_LOCATION, true, false, false, XmlRecordFactoryTest.specialDatasourceTypes);
+    	}
     	private InputStream load(final String fileName) {

modules/dnet-mapreduce-jobs/trunk/src/test/resources/eu/dnetlib/data/transform/projectRecordExtraInfo.xml
31	31	<FIELD name="callidentifier" isNull="true"/>
32	32	<FIELD name="projectid">arc_________::ANZCCART</FIELD>
33	33	<FIELD name="dateofcollection">2015-06-19</FIELD>
34		<FIELD name="enddate">2012-12-31</FIELD>
	34	<FIELD name="enddate"></FIELD>
35	35	<FIELD name="jsonextrainfo">{"a":"2", "b":"3"}</FIELD>
36	36	</ROW>

     package eu.dnetlib.data.mapreduce.hbase.index.config;
     import java.util.HashMap;
     import java.util.List;
     import eu.dnetlib.data.mapreduce.util.RelDescriptor;
-...
     	private HashMap<RelDescriptor, LinkDescriptor> links;
     	private List<String> includeFields;
     	private List<String> excludeFields;
     	public EntityConfig(final Boolean includeDuplicates, final HashMap<RelDescriptor, LinkDescriptor> links) {
     		super();
     		this.includeDuplicates = includeDuplicates;
     		this.links = links;
+    	}
     	public EntityConfig(final Boolean includeDuplicates,
     			final HashMap<RelDescriptor, LinkDescriptor> links,
     			final List<String> includeFields,
     			final List<String> excludeFields) {
     		super();
     		this.includeDuplicates = includeDuplicates;
     		this.links = links;
     		this.includeFields = includeFields;
     		this.excludeFields = excludeFields;
+    	}
     	public Boolean getIndexDuplicates() {
     		return includeDuplicates;
+    	}
-...
     		this.links = links;
+    	}
     	public List<String> getIncludeFields() {
     		return includeFields;
+    	}
     	public void setIncludeFields(final List<String> includeFields) {
     		this.includeFields = includeFields;
+    	}
     	public List<String> getExcludeFields() {
     		return excludeFields;
+    	}
     	public void setExcludeFields(final List<String> excludeFields) {
     		this.excludeFields = excludeFields;
+    	}
+    }

     package eu.dnetlib.data.mapreduce.hbase.index.config;
     import java.util.Collection;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.Set;
     import java.util.*;
     import com.google.common.base.Predicate;
     import com.google.common.base.Predicates;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Sets;
     import eu.dnetlib.data.mapreduce.util.RelDescriptor;
     import eu.dnetlib.data.proto.TypeProtos;
     import eu.dnetlib.data.proto.TypeProtos.Type;
     import org.apache.commons.collections.CollectionUtils;
     public class EntityConfigTable extends HashMap<Type, EntityConfig> {
     public class EntityConfigTable extends HashMap<TypeProtos.Type, EntityConfig> {
     	private static final long serialVersionUID = 6087987206844928698L;
     	public Collection<LinkDescriptor> getDescriptors(final Type source) {
     		final EntityConfig entityConfig = super.get(source);
     		if (entityConfig == null) return Lists.newArrayList();
     		return entityConfig.getLinks().values();
     		return Lists.newArrayList(entityConfig.getLinks().values());
+    	}
     	public LinkDescriptor getDescriptor(final Type type, final RelDescriptor relDescriptor) {
-...
     	public Set<String> getFilter(final Type type, final RelDescriptor relDescriptor) {
     		final LinkDescriptor ld = getDescriptor(type, relDescriptor);
     		return ld != null ? ld.getFields() : new HashSet<String>();
     		return ld != null ? Sets.newHashSet(ld.getFields()) : new HashSet<String>();
+    	}
     	public boolean includeDuplicates(final Type type) {
     		return super.get(type).getIndexDuplicates();
+    	}
+    }
     	public boolean hasIncludeFields(final Type type){
     		return CollectionUtils.isNotEmpty(super.get(type).getIncludeFields());
+    	}
     	public boolean hasExcludeFields(final Type type){
     		return CollectionUtils.isNotEmpty(super.get(type).getExcludeFields());
+    	}
     	public List<String> getIncludeFields(final Type type){
     		return super.get(type).getIncludeFields();
+    	}
     	public List<String> getExcludeFields(final Type type){
     		return super.get(type).getExcludeFields();
+    	}
     	public Predicate<String> getIncludeFilter(final Type type, final RelDescriptor relDescriptor){
     		final Set<String> filter = getFilter(type, relDescriptor);
     		return fieldName -> filter.contains(fieldName);
+    	}
     	public Predicate<String> getFilter(final Type type){
     		if(hasIncludeFields(type)){
     			return getIncludeFilter(type);
+    		}
     		if(hasExcludeFields(type)){
     			return getExcludeFilter(type);
+    		}
     		return Predicates.alwaysTrue();
+    	}
     	private Predicate<String> getIncludeFilter(final Type type) {
     		return fieldName -> {
     			if(getIncludeFields(type) == null || getIncludeFields(type).isEmpty()) return false;
     			return getIncludeFields(type).contains(fieldName);
     		};
+    	}
     	private Predicate<String> getExcludeFilter(final Type type) {
     		return fieldName -> {
     			if(getExcludeFields(type) == null || getExcludeFields(type).isEmpty()) return true;
     			return !getExcludeFields(type).contains(fieldName);
     		};
+    	}
+    }

     import com.typesafe.config.ConfigFactory;
     import com.typesafe.config.ConfigObject;
     import com.typesafe.config.ConfigValue;
     import eu.dnetlib.data.mapreduce.OptionalConfig;
     import eu.dnetlib.data.mapreduce.util.RelDescriptor;
     import eu.dnetlib.data.proto.TypeProtos.Type;
     import org.apache.commons.collections.CollectionUtils;
     public class IndexConfig extends OptionalConfig {
-...
     					links.put(relDescriptor, ld);
+    				}
     				return new EntityConfig((Boolean) ((Map<String, ?>) value.unwrapped()).get("dups"), links);
     				final List<String> includeFields = (List<String>) ((Map<String, ?>) value.unwrapped()).get("includeFields");
     				final List<String> excludeFields = (List<String>) ((Map<String, ?>) value.unwrapped()).get("excludeFields");
     				if(CollectionUtils.isNotEmpty(includeFields) & CollectionUtils.isNotEmpty(excludeFields)){
     					throw new RuntimeException("Cannot create the index configuration: includeFields and excludeFields are both not null");
+    				}
     				return new EntityConfig((Boolean) ((Map<String, ?>) value.unwrapped()).get("dups"), links, includeFields, excludeFields);
+    			}
     		});

     		return string;
+    	}
     	public String buildRecord(final Type type,
     	public String buildRecord(
     			final String objIdentifier,
     			final String dateOfCollection,
     			final String dateOfTransformation,

     import com.google.common.base.Joiner;
     import com.google.common.base.Predicate;
     import com.google.common.base.Splitter;
     import com.google.common.collect.Iterables;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Maps;
     import com.google.common.collect.Sets;
-...
     import eu.dnetlib.data.proto.ResultProtos.Result.ExternalReference;
     import eu.dnetlib.data.proto.ResultProtos.Result.Instance;
     import eu.dnetlib.data.proto.ResultProtos.Result.Journal;
     import eu.dnetlib.data.proto.TypeProtos;
     import eu.dnetlib.data.proto.TypeProtos.Type;
     import eu.dnetlib.miscutils.functional.UnaryFunction;
     import org.apache.commons.lang.StringUtils;
-...
     	protected Map<String, Integer> counters = Maps.newHashMap();
     	protected Transformer transformer;
     	protected static Predicate<String> instanceFilter = new Predicate<String>() {
     		final Set<String> instanceFieldFilter = Sets.newHashSet("instancetype", "hostedby", "licence");
     		@Override
     		public boolean apply(final String s) {
     			return instanceFieldFilter.contains(s);
+    		}
     	};
     	public XmlRecordFactory(final EntityConfigTable entityConfigTable, final ContextMapper contextMapper, final RelClasses relClasses,
     			final String schemaLocation, final boolean entityDefaults, final boolean relDefaults, final boolean childDefeaults, final Set<String> otherDatasourceTypesUForUI)
     			throws TransformerConfigurationException, TransformerFactoryConfigurationError {
-...
     			// log.info("chi:  " + children);
     			// log.info("=============");
     			final Type type = entity.getType();
     			final List<String> metadata = decodeType(entity, null, entityDefaults, false);
     			final Predicate<String> filter = entityConfigTable.getFilter(entity.getType());
     			final List<String> metadata = decodeType(entity, filter, entityDefaults, false);
     			// rels has to be processed before the contexts because they enrich the contextMap with the funding info.
     			final List<String> rels = listRelations();
     			metadata.addAll(buildContexts(type));
     			metadata.addAll(buildContexts(entity.getType()));
     			metadata.add(parseDataInfo(mainEntity));
     			final String body = templateFactory.buildBody(type, metadata, rels, listChildren(), extraInfo);
     			final String body = templateFactory.buildBody(entity.getType(), metadata, rels, listChildren(), extraInfo);
     			return templateFactory
     					.buildRecord(type, key, entity.getDateOfCollection(), entity.getDateOfTransformation(), schemaLocation, body, countersAsXml());
     					.buildRecord(key, entity.getDateOfCollection(), entity.getDateOfTransformation(), schemaLocation, body, countersAsXml());
     		} catch (final Throwable e) {
     			throw new RuntimeException(String.format("error building record '%s'", this.key), e);
+    		}
-...
     		return sb.toString();
+    	}
     	private List<String> decodeType(final OafEntityDecoder decoder, final Set<String> filter, final boolean defaults, final boolean expandingRel) {
     	private List<String> decodeType(final OafEntityDecoder decoder, final Predicate<String> filter, final boolean defaults, final boolean expandingRel) {
     		final List<String> metadata = Lists.newArrayList();
     		metadata.addAll(listFields(decoder.getMetadata(), filter, defaults, expandingRel));
-...
     			if (relDecoder.getRelSourceId().equals(key) || relDecoder.getRelTargetId().equals(key)) {
     				final List<String> metadata = Lists.newArrayList();
     				final Type targetType = relDecoder.getTargetType(mainEntity.getEntity().getType());
     				final Set<String> relFilter = entityConfigTable.getFilter(targetType, relDecoder.getRelDescriptor());
     				metadata.addAll(listFields(relDecoder.getSubRel(), relFilter, false, true));
     				final TypeProtos.Type targetType = relDecoder.getTargetType(mainEntity.getEntity().getType());
     				//final Set<String> relFilter = entityConfigTable.getFilter(targetType, relDecoder.getRelDescriptor());
     				metadata.addAll(listFields(relDecoder.getSubRel(), entityConfigTable.getIncludeFilter(targetType, relDecoder.getRelDescriptor()), false, true));
     				String semanticclass = "";
     				String semanticscheme = "";
-...
     				if ((cachedTarget != null) && cachedTarget.isInitialized()) {
     					final Set<String> filter = entityConfigTable.getFilter(targetType, relDescriptor);
     					//final Set<String> filter = entityConfigTable.getFilter(targetType, relDescriptor);
     					final OafEntityDecoder d = OafEntityDecoder.decode(cachedTarget);
     					metadata.addAll(decodeType(d, filter, relDefaults, true));
     					metadata.addAll(decodeType(d, entityConfigTable.getIncludeFilter(targetType, relDescriptor), relDefaults, true));
     					if (d.getType().equals(Type.result)) {
     						for(Instance i : cachedTarget.getResult().getInstanceList()) {
     							metadata.addAll(listFields(i, relFilter, false, true));
     							metadata.addAll(listFields(i, entityConfigTable.getIncludeFilter(targetType, relDecoder.getRelDescriptor()), false, true));
+    						}
+    					}
+    				}
-...
     		final OafEntityDecoder entity = mainEntity.decodeEntity();
     		if (entity.getType().equals(Type.result)) {
     			for (final Instance instance : ((Result) entity.getEntity()).getInstanceList()) {
     				final Set<String> instanceFieldFilter = Sets.newHashSet("instancetype", "hostedby", "licence");
     				children.add(templateFactory.getInstance(instance.getHostedby().getKey(), listFields(instance, instanceFieldFilter, false, false),
     				children.add(templateFactory.getInstance(instance.getHostedby().getKey(), listFields(instance, instanceFilter, false, false),
     						listMap(instance.getUrlList(), new UnaryFunction<String, String>() {
     							@Override
-...
     	private void addChildren(final List<String> children, final OafEntity target, final RelDescriptor relDescriptor) {
     		final OafEntityDecoder decoder = OafEntityDecoder.decode(target);
     		incrementCounter(relDescriptor.getSubRelType().toString());
     		final Set<String> filters = entityConfigTable.getFilter(target.getType(), relDescriptor);
     		children.add(templateFactory.getChild(decoder.getType().toString(), decoder.getId(), listFields(decoder.getMetadata(), filters, childDefaults, false)));
     		final Predicate<String> filter = entityConfigTable.getIncludeFilter(target.getType(), relDescriptor);
     		children.add(templateFactory.getChild(decoder.getType().toString(), decoder.getId(), listFields(decoder.getMetadata(), filter, childDefaults, false)));
+    	}
     	private List<String> listFields(final GeneratedMessage fields, final Set<String> filter, final boolean defaults, final boolean expandingRel) {
     	private List<String> listFields(final GeneratedMessage fields, final Predicate<String> filter, final boolean defaults, final boolean expandingRel) {
     		final List<String> metadata = Lists.newArrayList();
     		if (fields != null) {
     			final Set<String> seen = Sets.newHashSet();
     			for (final Entry<FieldDescriptor, Object> e : filterFields(fields, filter)) {
     				// final String name = getFieldName(e.getKey().getName());
     			final Map<FieldDescriptor, Object> filtered = filterFields(fields, filter);
     			for (final Entry<FieldDescriptor, Object> e : filtered.entrySet()) {
     				final String name = e.getKey().getName();
     				seen.add(name);
     				addFieldValue(metadata, e.getKey(), e.getValue(), expandingRel);
+    			}
     			if (defaults) {
     				for (final FieldDescriptor fd : fields.getDescriptorForType().getFields()) {
     					if (!seen.contains(fd.getName())) {
     						addFieldValue(metadata, fd, getDefault(fd), expandingRel);
     				final Iterable<FieldDescriptor> unseen = Iterables.filter(fields.getDescriptorForType().getFields(), new Predicate<FieldDescriptor>() {
     					@Override
     					public boolean apply(final FieldDescriptor fd) {
     						return !seen.contains(fd.getName()) && filter.apply(fd.getName());
+    					}
     				});
     				for(FieldDescriptor fd : unseen){
     					addFieldValue(metadata, fd, getDefault(fd), expandingRel);
+    				}
+    			}
+    		}
-...
     			if (Journal.getDescriptor().equals(fd.getMessageType()) && (o != null)) {
     				final Journal j = (Journal) o;
     				metadata.add("<journal " + "issn=\"" + escapeXml(j.getIssnPrinted()) + "\" " + "eissn=\"" + escapeXml(j.getIssnOnline()) + "\" " + "lissn=\""
     						+ escapeXml(j.getIssnLinking()) + "\">" + escapeXml(j.getName()) + "</journal>");
     						+ escapeXml(j.getIssnLinking()) + "\" " + "ep=\"" + escapeXml(j.getEp()) + "\" " + "iss=\"" + escapeXml(j.getIss()) + "\" " + "sp=\""
     						+ escapeXml(j.getSp()) + "\" " + "vol=\"" + escapeXml(j.getVol()) + "\">" + escapeXml(j.getName()) + "</journal>");
+    			}
     			if (Context.getDescriptor().equals(fd.getMessageType()) && (o != null)) {
-...
     		return sb.toString();
+    	}
     	private Set<Entry<FieldDescriptor, Object>> filterFields(final GeneratedMessage fields, final Set<String> filter) {
     		if (filter != null) {
     			final Predicate<FieldDescriptor> p = new Predicate<FieldDescriptor>() {
     				@Override
     				public boolean apply(final FieldDescriptor descriptor) {
     					if (fields == null) return false;
     					final String name = descriptor.getName();
     					return filter.contains(name);
+    				}
     			};
     			final Map<FieldDescriptor, Object> filtered = Maps.filterKeys(fields.getAllFields(), p);
     			// log.info(
     			// "filtered " + type.toString() + ": " + toString(filterEntries.keySet()) + "\n" +
     			// "builder  " + fields.getDescriptorForType().getFullName() + ": " + toString(fields.getAllFields().keySet()));
     			return filtered.entrySet();
     	private Map<FieldDescriptor, Object> filterFields(final GeneratedMessage fields, final Predicate<String> acceptFilter) {
     		if(acceptFilter == null) return fields.getAllFields();
     		final Map<FieldDescriptor, Object> res = Maps.newHashMap();
     		for(Entry<FieldDescriptor, Object> e : fields.getAllFields().entrySet()) {
     			if (acceptFilter.apply(e.getKey().getName())) {
     				res.put(e.getKey(), e.getValue());
+    			}
+    		}
     		return fields.getAllFields().entrySet();
     		return res;
+    	}
     	private List<String> countersAsXml() {
     		final List<String> out = Lists.newArrayList();
     		for (final Entry<String, Integer> e : counters.entrySet()) {

     	<modelVersion>4.0.0</modelVersion>
     	<groupId>eu.dnetlib</groupId>
     	<artifactId>dnet-mapreduce-jobs</artifactId>
     	<version>0.0.9.7-PIWIK-SNAPSHOT</version>
     	<version>1.0.0-SNAPSHOT</version>
     	<packaging>jar</packaging>
     	<scm>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-mapreduce-jobs/trunk</developerConnection>
-...
     		<dependency>
     			<groupId>org.apache.solr</groupId>
     			<artifactId>solr-solrj</artifactId>
     			<version>[4.7.0, 5.0.0)</version>
     			<version>[4.10.4]</version>
     			<exclusions>
     				<exclusion>
     					<artifactId>wstx-asl</artifactId>
     					<groupId>org.codehaus.woodstox</groupId>
     				</exclusion>
     <!--
     				<exclusion>
     					<artifactId>httpcore</artifactId>
     					<groupId>org.apache.httpcomponents</groupId>
     				</exclusion>
     				<exclusion>
     					<artifactId>httpclient</artifactId>
     					<groupId>org.apache.httpcomponents</groupId>
     				</exclusion>
     -->
     			</exclusions>
     		</dependency>
     		<dependency>
-...
     			<version>[1.0.0,2.0.0)</version>
     			<scope>test</scope>
     		</dependency>
     		<dependency>
     			<groupId>com.google.guava</groupId>
     			<artifactId>guava</artifactId>
     			<version>RELEASE</version>
     		</dependency>
     	</dependencies>
     </project>

Project

General

Profile

D-Net

Revision 46587

Added by Alessia Bardi about 7 years ago