Project

General

Profile

« Previous | Next » 

Revision 48800

more logging in the oozie job monitor procedure that tries to fetch the job report. More java8 refactorings

View differences:

JobRegistry.java
2 2

  
3 3
import java.util.Date;
4 4
import java.util.List;
5
import java.util.Map;
6 5
import java.util.Map.Entry;
6
import java.util.Objects;
7
import java.util.stream.Collectors;
7 8

  
8
import org.apache.commons.logging.Log;
9
import org.apache.commons.logging.LogFactory;
10
import org.springframework.beans.factory.annotation.Required;
11

  
12 9
import com.google.common.collect.BiMap;
13 10
import com.google.common.collect.HashBiMap;
14
import com.google.common.collect.Iterables;
15
import com.google.common.collect.Lists;
16
import com.google.common.collect.Maps;
17

  
18 11
import eu.dnetlib.data.hadoop.HadoopJob.Status;
19 12
import eu.dnetlib.data.hadoop.config.ClusterName;
20 13
import eu.dnetlib.data.hadoop.rmi.HadoopJobDescriptor;
21 14
import eu.dnetlib.data.hadoop.rmi.HadoopServiceException;
22 15
import eu.dnetlib.data.hadoop.utils.HadoopUtils;
16
import org.apache.commons.logging.Log;
17
import org.apache.commons.logging.LogFactory;
18
import org.springframework.beans.factory.annotation.Required;
23 19

  
24 20
public class JobRegistry {
25 21

  
......
84 80
	}
85 81

  
86 82
	public List<HadoopJobDescriptor> listJobs(ClusterName clusterName) {
87
		Map<String, HadoopJob> filtered = Maps.filterValues(jobs, HadoopUtils.filterByCluster(clusterName));
88
		return Lists.newArrayList(Iterables.transform(filtered.entrySet(), HadoopUtils.hadoopJobDescriptor()));
83
		return jobs.values().stream()
84
				.filter(j -> clusterName.equals(j.getClusterName()))
85
				.map(HadoopUtils.asDescriptor())
86
				.filter(Objects::nonNull)
87
				.collect(Collectors.toList());
89 88
	}
90 89

  
91 90
	@Required

Also available in: Unified diff