You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/08/16 10:57:27 UTC
[2/4] incubator-griffin git commit: Fix bugs about code style
violation against Griffin rules
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
index d6da5e4..f817f65 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
@@ -50,7 +50,8 @@ import org.springframework.stereotype.Service;
@Service
public class MetricServiceImpl implements MetricService {
- private static final Logger LOGGER = LoggerFactory.getLogger(MetricServiceImpl.class);
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(MetricServiceImpl.class);
@Autowired
private MeasureRepo<Measure> measureRepo;
@@ -64,16 +65,20 @@ public class MetricServiceImpl implements MetricService {
Map<String, List<Metric>> metricMap = new HashMap<>();
List<AbstractJob> jobs = jobRepo.findByDeleted(false);
List<Measure> measures = measureRepo.findByDeleted(false);
- Map<Long, Measure> measureMap = measures.stream().collect(Collectors.toMap(Measure::getId, Function.identity()));
- Map<Long, List<AbstractJob>> jobMap = jobs.stream().collect(Collectors.groupingBy(AbstractJob::getMeasureId, Collectors.toList()));
+ Map<Long, Measure> measureMap = measures.stream().collect(Collectors
+ .toMap(Measure::getId, Function.identity()));
+ Map<Long, List<AbstractJob>> jobMap = jobs.stream().collect(Collectors
+ .groupingBy(AbstractJob::getMeasureId, Collectors.toList()));
for (Map.Entry<Long, List<AbstractJob>> entry : jobMap.entrySet()) {
Long measureId = entry.getKey();
Measure measure = measureMap.get(measureId);
List<AbstractJob> jobList = entry.getValue();
List<Metric> metrics = new ArrayList<>();
for (AbstractJob job : jobList) {
- List<MetricValue> metricValues = getMetricValues(job.getMetricName(), 0, 300, job.getCreatedDate());
- metrics.add(new Metric(job.getMetricName(), measure.getDqType(), measure.getOwner(), metricValues));
+ List<MetricValue> metricValues = getMetricValues(job
+ .getMetricName(), 0, 300, job.getCreatedDate());
+ metrics.add(new Metric(job.getMetricName(), measure.getDqType(),
+ measure.getOwner(), metricValues));
}
metricMap.put(measure.getName(), metrics);
@@ -82,18 +87,23 @@ public class MetricServiceImpl implements MetricService {
}
@Override
- public List<MetricValue> getMetricValues(String metricName, int offset, int size, long tmst) {
+ public List<MetricValue> getMetricValues(String metricName, int offset,
+ int size, long tmst) {
if (offset < 0) {
- throw new GriffinException.BadRequestException(INVALID_METRIC_RECORDS_OFFSET);
+ throw new GriffinException.BadRequestException
+ (INVALID_METRIC_RECORDS_OFFSET);
}
if (size < 0) {
- throw new GriffinException.BadRequestException(INVALID_METRIC_RECORDS_SIZE);
+ throw new GriffinException.BadRequestException
+ (INVALID_METRIC_RECORDS_SIZE);
}
try {
return metricStore.getMetricValues(metricName, offset, size, tmst);
} catch (IOException e) {
- LOGGER.error("Failed to get metric values named {}. {}", metricName, e.getMessage());
- throw new GriffinException.ServiceException("Failed to get metric values", e);
+ LOGGER.error("Failed to get metric values named {}. {}",
+ metricName, e.getMessage());
+ throw new GriffinException.ServiceException(
+ "Failed to get metric values", e);
}
}
@@ -107,10 +117,12 @@ public class MetricServiceImpl implements MetricService {
return metricStore.addMetricValues(values);
} catch (JsonProcessingException e) {
LOGGER.warn("Failed to parse metric value.", e.getMessage());
- throw new GriffinException.BadRequestException(INVALID_METRIC_VALUE_FORMAT);
+ throw new GriffinException.BadRequestException
+ (INVALID_METRIC_VALUE_FORMAT);
} catch (IOException e) {
LOGGER.error("Failed to add metric values", e);
- throw new GriffinException.ServiceException("Failed to add metric values", e);
+ throw new GriffinException.ServiceException(
+ "Failed to add metric values", e);
}
}
@@ -120,14 +132,18 @@ public class MetricServiceImpl implements MetricService {
try {
return metricStore.deleteMetricValues(metricName);
} catch (IOException e) {
- LOGGER.error("Failed to delete metric values named {}. {}", metricName, e.getMessage());
- throw new GriffinException.ServiceException("Failed to delete metric values.", e);
+ LOGGER.error("Failed to delete metric values named {}. {}",
+ metricName, e.getMessage());
+ throw new GriffinException.ServiceException(
+ "Failed to delete metric values.", e);
}
}
private void checkFormat(MetricValue value) {
- if (StringUtils.isBlank(value.getName()) || value.getTmst() == null || MapUtils.isEmpty(value.getValue())) {
- throw new GriffinException.BadRequestException(INVALID_METRIC_VALUE_FORMAT);
+ if (StringUtils.isBlank(value.getName()) || value.getTmst() == null
+ || MapUtils.isEmpty(value.getValue())) {
+ throw new GriffinException.BadRequestException
+ (INVALID_METRIC_VALUE_FORMAT);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/metric/MetricStore.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricStore.java b/service/src/main/java/org/apache/griffin/core/metric/MetricStore.java
index e339b37..a452648 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricStore.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricStore.java
@@ -27,9 +27,11 @@ import org.springframework.http.ResponseEntity;
public interface MetricStore {
- List<MetricValue> getMetricValues(String metricName, int from, int size, long tmst) throws IOException;
+ List<MetricValue> getMetricValues(String metricName, int from, int size,
+ long tmst) throws IOException;
- ResponseEntity<?> addMetricValues(List<MetricValue> metricValues) throws IOException;
+ ResponseEntity<?> addMetricValues(List<MetricValue> metricValues)
+ throws IOException;
ResponseEntity<?> deleteMetricValues(String metricName) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
index 243a65d..3bff8f5 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
@@ -76,7 +76,8 @@ public class MetricStoreImpl implements MetricStore {
if (!user.isEmpty() && !password.isEmpty()) {
String encodedAuth = buildBasicAuthString(user, password);
Header[] requestHeaders = new Header[]{
- new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION, encodedAuth)};
+ new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION,
+ encodedAuth)};
builder.setDefaultHeaders(requestHeaders);
}
this.client = builder.build();
@@ -87,15 +88,23 @@ public class MetricStoreImpl implements MetricStore {
this.urlGet = urlBase.concat("/_search?filter_path=hits.hits._source");
this.urlPost = urlBase.concat("/_bulk");
this.urlDelete = urlBase.concat("/_delete_by_query");
- this.indexMetaData = String.format("{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", INDEX, TYPE);
+ this.indexMetaData = String.format(
+ "{ \"index\" : { \"_index\" : " +
+ "\"%s\",\"_type\" : \"%s\" } }%n",
+ INDEX,
+ TYPE);
this.mapper = new ObjectMapper();
}
@Override
- public List<MetricValue> getMetricValues(String metricName, int from, int size, long tmst) throws IOException {
- HttpEntity entity = getHttpEntityForSearch(metricName, from, size, tmst);
+ public List<MetricValue> getMetricValues(String metricName, int from,
+ int size, long tmst)
+ throws IOException {
+ HttpEntity entity = getHttpEntityForSearch(metricName, from, size,
+ tmst);
try {
- Response response = client.performRequest("GET", urlGet, Collections.emptyMap(), entity);
+ Response response = client.performRequest("GET", urlGet,
+ Collections.emptyMap(), entity);
return getMetricValuesFromResponse(response);
} catch (ResponseException e) {
if (e.getResponse().getStatusLine().getStatusCode() == 404) {
@@ -105,33 +114,43 @@ public class MetricStoreImpl implements MetricStore {
}
}
- private HttpEntity getHttpEntityForSearch(String metricName, int from, int size, long tmst)
+ private HttpEntity getHttpEntityForSearch(String metricName, int from, int
+ size, long tmst)
throws JsonProcessingException {
Map<String, Object> map = new HashMap<>();
Map<String, Object> queryParam = new HashMap<>();
- Map<String, Object> termQuery = Collections.singletonMap("name.keyword", metricName);
+ Map<String, Object> termQuery = Collections.singletonMap("name.keyword",
+ metricName);
queryParam.put("filter", Collections.singletonMap("term", termQuery));
Map<String, Object> sortParam = Collections
- .singletonMap("tmst", Collections.singletonMap("order", "desc"));
+ .singletonMap("tmst", Collections.singletonMap("order",
+ "desc"));
map.put("query", Collections.singletonMap("bool", queryParam));
map.put("sort", sortParam);
map.put("from", from);
map.put("size", size);
- return new NStringEntity(JsonUtil.toJson(map), ContentType.APPLICATION_JSON);
+ return new NStringEntity(JsonUtil.toJson(map),
+ ContentType.APPLICATION_JSON);
}
- private List<MetricValue> getMetricValuesFromResponse(Response response) throws IOException {
+ private List<MetricValue> getMetricValuesFromResponse(Response response)
+ throws IOException {
List<MetricValue> metricValues = new ArrayList<>();
- JsonNode jsonNode = mapper.readTree(EntityUtils.toString(response.getEntity()));
+ JsonNode jsonNode = mapper.readTree(EntityUtils.toString(response
+ .getEntity()));
if (jsonNode.hasNonNull("hits") && jsonNode.get("hits")
.hasNonNull("hits")) {
for (JsonNode node : jsonNode.get("hits").get("hits")) {
JsonNode sourceNode = node.get("_source");
- Map<String, Object> value = JsonUtil.toEntity(sourceNode.get("value").toString(),
+ Map<String, Object> value = JsonUtil.toEntity(sourceNode
+ .get("value").toString(),
new TypeReference<Map<String, Object>>() {
});
- MetricValue metricValue = new MetricValue(sourceNode.get("name").asText(),
- Long.parseLong(sourceNode.get("tmst").asText()), value);
+ MetricValue metricValue = new MetricValue(sourceNode
+ .get("name")
+ .asText(),
+ Long.parseLong(sourceNode.get("tmst").asText()),
+ value);
metricValues.add(metricValue);
}
}
@@ -139,14 +158,18 @@ public class MetricStoreImpl implements MetricStore {
}
@Override
- public ResponseEntity<?> addMetricValues(List<MetricValue> metricValues) throws IOException {
+ public ResponseEntity<?> addMetricValues(List<MetricValue> metricValues)
+ throws IOException {
String bulkRequestBody = getBulkRequestBody(metricValues);
- HttpEntity entity = new NStringEntity(bulkRequestBody, ContentType.APPLICATION_JSON);
- Response response = client.performRequest("POST", urlPost, Collections.emptyMap(), entity);
+ HttpEntity entity = new NStringEntity(bulkRequestBody,
+ ContentType.APPLICATION_JSON);
+ Response response = client.performRequest("POST", urlPost,
+ Collections.emptyMap(), entity);
return getResponseEntityFromResponse(response);
}
- private String getBulkRequestBody(List<MetricValue> metricValues) throws JsonProcessingException {
+ private String getBulkRequestBody(List<MetricValue> metricValues) throws
+ JsonProcessingException {
StringBuilder bulkRequestBody = new StringBuilder();
for (MetricValue metricValue : metricValues) {
bulkRequestBody.append(indexMetaData);
@@ -157,22 +180,30 @@ public class MetricStoreImpl implements MetricStore {
}
@Override
- public ResponseEntity<?> deleteMetricValues(String metricName) throws IOException {
+ public ResponseEntity<?> deleteMetricValues(String metricName) throws
+ IOException {
Map<String, Object> param = Collections.singletonMap("query",
- Collections.singletonMap("term", Collections.singletonMap("name.keyword", metricName)));
- HttpEntity entity = new NStringEntity(JsonUtil.toJson(param), ContentType.APPLICATION_JSON);
- Response response = client.performRequest("POST", urlDelete, Collections.emptyMap(), entity);
+ Collections.singletonMap("term",
+ Collections.singletonMap("name.keyword", metricName)));
+ HttpEntity entity = new NStringEntity(
+ JsonUtil.toJson(param),
+ ContentType.APPLICATION_JSON);
+ Response response = client.performRequest("POST", urlDelete,
+ Collections.emptyMap(), entity);
return getResponseEntityFromResponse(response);
}
- private ResponseEntity<?> getResponseEntityFromResponse(Response response) throws IOException {
+ private ResponseEntity<?> getResponseEntityFromResponse(Response response)
+ throws IOException {
String body = EntityUtils.toString(response.getEntity());
- HttpStatus status = HttpStatus.valueOf(response.getStatusLine().getStatusCode());
+ HttpStatus status = HttpStatus.valueOf(response.getStatusLine()
+ .getStatusCode());
return new ResponseEntity<>(body, responseHeaders, status);
}
private static String buildBasicAuthString(String user, String password) {
String auth = user + ":" + password;
- return String.format("Basic %s", Base64.getEncoder().encodeToString(auth.getBytes()));
+ return String.format("Basic %s", Base64.getEncoder().encodeToString(
+ auth.getBytes()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java b/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
index 67c1985..52de5fb 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
@@ -33,7 +33,8 @@ public class Metric {
public Metric() {
}
- public Metric(String name, DqType type, String owner, List<MetricValue> metricValues) {
+ public Metric(String name, DqType type, String owner,
+ List<MetricValue> metricValues) {
this.name = name;
this.type = type;
this.owner = owner;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/FSUtil.java b/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
index fb0fb2b..71f55d2 100644
--- a/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
@@ -60,12 +60,16 @@ public class FSUtil {
Configuration conf = new Configuration();
if (StringUtils.isEmpty(conf.get("fs.hdfs.impl"))) {
- LOGGER.info("Setting fs.hdfs.impl:{}", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
- conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
+ LOGGER.info("Setting fs.hdfs.impl:{}", org.apache.hadoop.hdfs
+ .DistributedFileSystem.class.getName());
+ conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs
+ .DistributedFileSystem.class.getName());
}
if (StringUtils.isEmpty(conf.get("fs.file.impl"))) {
- LOGGER.info("Setting fs.file.impl:{}", org.apache.hadoop.fs.LocalFileSystem.class.getName());
- conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
+ LOGGER.info("Setting fs.file.impl:{}", org.apache.hadoop.fs
+ .LocalFileSystem.class.getName());
+ conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class
+ .getName());
}
try {
fileSystem = FileSystem.get(conf);
@@ -147,11 +151,13 @@ public class FSUtil {
return fileSystem.isFile(hdfsPath) || fileSystem.isDirectory(hdfsPath);
}
- public static InputStream getSampleInputStream(String path) throws IOException {
+ public static InputStream getSampleInputStream(String path)
+ throws IOException {
checkHDFSConf();
if (isFileExist(path)) {
FSDataInputStream missingData = fileSystem.open(new Path(path));
- BufferedReader bufReader = new BufferedReader(new InputStreamReader(missingData, Charsets.UTF_8));
+ BufferedReader bufReader = new BufferedReader(
+ new InputStreamReader(missingData, Charsets.UTF_8));
try {
String line = null;
int rowCnt = 0;
@@ -177,25 +183,30 @@ public class FSUtil {
private static void checkHDFSConf() {
if (getFileSystem() == null) {
- throw new NullPointerException("FileSystem is null.Please check your hdfs config default name.");
+ throw new NullPointerException("FileSystem is null. " +
+ "Please check your hdfs config default name.");
}
}
- public static String getFirstMissRecordPath(String hdfsDir) throws Exception {
+ public static String getFirstMissRecordPath(String hdfsDir)
+ throws Exception {
List<FileStatus> fileList = listFileStatus(hdfsDir);
for (int i = 0; i < fileList.size(); i++) {
- if (fileList.get(i).getPath().toUri().toString().toLowerCase().contains("missrecord")) {
+ if (fileList.get(i).getPath().toUri().toString().toLowerCase()
+ .contains("missrecord")) {
return fileList.get(i).getPath().toUri().toString();
}
}
return null;
}
- public static InputStream getMissSampleInputStream(String path) throws Exception {
+ public static InputStream getMissSampleInputStream(String path)
+ throws Exception {
List<String> subDirList = listSubDir(path);
//FIXME: only handle 1-sub dir here now
for (int i = 0; i < subDirList.size(); i++) {
- return getSampleInputStream(getFirstMissRecordPath(subDirList.get(i)));
+ return getSampleInputStream(getFirstMissRecordPath(
+ subDirList.get(i)));
}
return getSampleInputStream(getFirstMissRecordPath(path));
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/FileUtil.java b/service/src/main/java/org/apache/griffin/core/util/FileUtil.java
index 99795d6..d2209f9 100644
--- a/service/src/main/java/org/apache/griffin/core/util/FileUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/FileUtil.java
@@ -26,7 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FileUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class);
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(FileUtil.class);
public static String getFilePath(String name, String location) {
if (StringUtils.isEmpty(location)) {
@@ -37,13 +38,15 @@ public class FileUtil {
LOGGER.info("File absolute path:" + file.getAbsolutePath());
File[] files = file.listFiles();
if (files == null) {
- LOGGER.warn("The external location '{}' does not exist.Read from default path.", location);
+ LOGGER.warn("The external location '{}' does not exist.Read from"
+ + "default path.", location);
return null;
}
return getFilePath(name, files, location);
}
- private static String getFilePath(String name, File[] files, String location) {
+ private static String getFilePath(String name, File[] files,
+ String location) {
String path = null;
for (File f : files) {
if (f.getName().equals(name)) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java b/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
index fb2afa6..0fe6449 100644
--- a/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
@@ -34,7 +34,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JsonUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(JsonUtil.class);
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(JsonUtil.class);
public static String toJson(Object obj) throws JsonProcessingException {
if (obj == null) {
@@ -45,26 +46,31 @@ public class JsonUtil {
return mapper.writeValueAsString(obj);
}
- public static String toJsonWithFormat(Object obj) throws JsonProcessingException {
+ public static String toJsonWithFormat(Object obj)
+ throws JsonProcessingException {
if (obj == null) {
LOGGER.warn("Object to be formatted cannot be empty!");
return null;
}
- ObjectWriter mapper = new ObjectMapper().writer().withDefaultPrettyPrinter();
+ ObjectWriter mapper = new ObjectMapper().writer()
+ .withDefaultPrettyPrinter();
return mapper.writeValueAsString(obj);
}
- public static <T> T toEntity(String jsonStr, Class<T> type) throws IOException {
+ public static <T> T toEntity(String jsonStr, Class<T> type)
+ throws IOException {
if (StringUtils.isEmpty(jsonStr)) {
LOGGER.warn("Json string {} is empty!", type);
return null;
}
ObjectMapper mapper = new ObjectMapper();
- mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
+ false);
return mapper.readValue(jsonStr, type);
}
- public static <T> T toEntity(File file, TypeReference type) throws IOException {
+ public static <T> T toEntity(File file, TypeReference type)
+ throws IOException {
if (file == null) {
LOGGER.warn("File cannot be empty!");
return null;
@@ -73,7 +79,8 @@ public class JsonUtil {
return mapper.readValue(file, type);
}
- public static <T> T toEntity(InputStream in, TypeReference type) throws IOException {
+ public static <T> T toEntity(InputStream in, TypeReference type)
+ throws IOException {
if (in == null) {
throw new NullPointerException("Input stream cannot be null.");
}
@@ -81,7 +88,8 @@ public class JsonUtil {
return mapper.readValue(in, type);
}
- public static <T> T toEntity(String jsonStr, TypeReference type) throws IOException {
+ public static <T> T toEntity(String jsonStr, TypeReference type)
+ throws IOException {
if (StringUtils.isEmpty(jsonStr)) {
LOGGER.warn("Json string {} is empty!", type);
return null;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java b/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
index 6933b70..56ef204 100644
--- a/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
@@ -37,7 +37,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MeasureUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(MeasureUtil.class);
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(MeasureUtil.class);
public static void validateMeasure(Measure measure) {
if (measure instanceof GriffinMeasure) {
@@ -50,13 +51,15 @@ public class MeasureUtil {
private static void validateGriffinMeasure(GriffinMeasure measure) {
if (getConnectorNamesIfValid(measure) == null) {
- throw new GriffinException.BadRequestException(INVALID_CONNECTOR_NAME);
+ throw new GriffinException.BadRequestException
+ (INVALID_CONNECTOR_NAME);
}
}
private static void validateExternalMeasure(ExternalMeasure measure) {
if (StringUtils.isBlank(measure.getMetricName())) {
- LOGGER.warn("Failed to create external measure {}. Its metric name is blank.", measure.getName());
+ LOGGER.warn("Failed to create external measure {}. " +
+ "Its metric name is blank.", measure.getName());
throw new GriffinException.BadRequestException(MISSING_METRIC_NAME);
}
}
@@ -65,7 +68,8 @@ public class MeasureUtil {
Set<String> sets = new HashSet<>();
List<DataSource> sources = measure.getDataSources();
for (DataSource source : sources) {
- source.getConnectors().stream().filter(dc -> dc.getName() != null).forEach(dc -> sets.add(dc.getName()));
+ source.getConnectors().stream().filter(dc -> dc.getName() != null)
+ .forEach(dc -> sets.add(dc.getName()));
}
if (sets.size() == 0 || sets.size() < sources.size()) {
LOGGER.warn("Connector names cannot be repeated or empty.");
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java b/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java
index 3d55a2a..65f1707 100644
--- a/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java
@@ -34,7 +34,8 @@ import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
public class PropertiesUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesUtil.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(
+ PropertiesUtil.class);
public static Properties getProperties(String path, Resource resource) {
PropertiesFactoryBean propFactoryBean = new PropertiesFactoryBean();
@@ -55,9 +56,12 @@ public class PropertiesUtil {
* @param defaultPath properties classpath like /quartz.properties
* @param location custom properties path
* @return Properties
- * @throws FileNotFoundException location setting is wrong that there is no target file.
+ * @throws FileNotFoundException location setting is wrong that there is no
+ * target file.
*/
- public static Properties getConf(String name, String defaultPath, String location) throws FileNotFoundException {
+ public static Properties getConf(String name, String defaultPath,
+ String location)
+ throws FileNotFoundException {
String path = getConfPath(name, location);
Resource resource;
if (path == null) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
index 7ffb626..b233c54 100644
--- a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
@@ -32,12 +32,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TimeUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(TimeUtil.class);
- private static final String MILLISECONDS_PATTERN = "(?i)m(illi)?s(ec(ond)?)?";
- private static final String SECONDS_PATTERN = "(?i)s(ec(ond)?)?";
- private static final String MINUTES_PATTERN = "(?i)m(in(ute)?)?";
- private static final String HOURS_PATTERN = "(?i)h((ou)?r)?";
- private static final String DAYS_PATTERN = "(?i)d(ay)?";
+ private static final Logger LOGGER = LoggerFactory.getLogger(TimeUtil
+ .class);
+ private static final String MILLISECONDS_PATTERN =
+ "(?i)m(illi)?s(ec(ond)?)?";
+ private static final String SECONDS_PATTERN =
+ "(?i)s(ec(ond)?)?";
+ private static final String MINUTES_PATTERN =
+ "(?i)m(in(ute)?)?";
+ private static final String HOURS_PATTERN =
+ "(?i)h((ou)?r)?";
+ private static final String DAYS_PATTERN =
+ "(?i)d(ay)?";
private static class TimeUnitPair {
private long t;
@@ -106,7 +112,10 @@ public class TimeUtil {
} else if (unit.matches(DAYS_PATTERN)) {
return milliseconds(t, TimeUnit.DAYS);
} else {
- LOGGER.warn("Time string format ERROR.It only supports d(day),h(hour),m(minute),s(second),ms(millsecond).Please check your time format.");
+ LOGGER.warn("Time string format ERROR. " +
+ "It only supports d(day),h(hour), m(minute), " +
+ "s(second), ms(millsecond). " +
+ "Please check your time format.");
return 0L;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
index f78f205..f935aad 100644
--- a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
@@ -30,14 +30,17 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.client.RestTemplate;
public class YarnNetUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(YarnNetUtil.class);
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(YarnNetUtil.class);
private static RestTemplate restTemplate = new RestTemplate();
public static void delete(String url, String appId) {
try {
if (appId != null) {
LOGGER.info("{} will delete by yarn", appId);
- restTemplate.put(url + "ws/v1/cluster/apps/" + appId + "/state", "{\"state\": \"KILLED\"}");
+ restTemplate.put(url + "ws/v1/cluster/apps/"
+ + appId + "/state",
+ "{\"state\": \"KILLED\"}");
}
} catch (Exception e) {
LOGGER.error("delete exception happens by yarn. {}", e);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java b/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
index a6ec9ad..c0d7837 100644
--- a/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
+++ b/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
@@ -37,9 +37,11 @@ import org.springframework.transaction.jta.JtaTransactionManager;
@TestConfiguration
@ComponentScan("org.apache.griffin.core")
public class EclipseLinkJpaConfigForTest extends JpaBaseConfiguration {
- protected EclipseLinkJpaConfigForTest(DataSource ds, JpaProperties properties,
- ObjectProvider<JtaTransactionManager> jtm,
- ObjectProvider<TransactionManagerCustomizers> tmc) {
+ protected EclipseLinkJpaConfigForTest(
+ DataSource ds,
+ JpaProperties properties,
+ ObjectProvider<JtaTransactionManager> jtm,
+ ObjectProvider<TransactionManagerCustomizers> tmc) {
super(ds, properties, jtm, tmc);
}
@@ -52,7 +54,8 @@ public class EclipseLinkJpaConfigForTest extends JpaBaseConfiguration {
protected Map<String, Object> getVendorProperties() {
Map<String, Object> map = new HashMap<>();
map.put(PersistenceUnitProperties.WEAVING, "false");
- map.put(PersistenceUnitProperties.DDL_GENERATION, "create-or-extend-tables");
+ map.put(PersistenceUnitProperties.DDL_GENERATION,
+ "create-or-extend-tables");
return map;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
index cd48f3f..ebd5a97 100644
--- a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
+++ b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
@@ -114,12 +114,14 @@ public class PropertiesConfigTest {
@Test
public void quartzConfWithLocationNotNull() throws Exception {
Properties conf = quartzConf.quartzConf();
- assertEquals(conf.get("org.quartz.scheduler.instanceName"), "spring-boot-quartz-test");
+ assertEquals(conf.get("org.quartz.scheduler.instanceName"),
+ "spring-boot-quartz-test");
}
@Test
public void quartzConfWithLocationNull() throws Exception {
Properties conf = noQuartzConf.quartzConf();
- assertEquals(conf.get("org.quartz.scheduler.instanceName"), "spring-boot-quartz-test");
+ assertEquals(conf.get("org.quartz.scheduler.instanceName"),
+ "spring-boot-quartz-test");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
index d71814a..8ded661 100644
--- a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
@@ -45,4 +45,4 @@ public class GriffinInfoControllerTest {
.andExpect(status().isOk())
.andExpect(jsonPath("$", is("0.2.0")));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
index 498b04b..380c105 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
@@ -95,7 +95,8 @@ public class JobControllerTest {
@Test
public void testDeleteJobByIdForFailureWithNotFound() throws Exception {
- doThrow(new GriffinException.NotFoundException(JOB_ID_DOES_NOT_EXIST)).when(service).deleteJob(1L);
+ doThrow(new GriffinException.NotFoundException(JOB_ID_DOES_NOT_EXIST))
+ .when(service).deleteJob(1L);
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs/1"))
.andExpect(status().isNotFound());
@@ -103,7 +104,8 @@ public class JobControllerTest {
@Test
public void testDeleteJobByIdForFailureWithException() throws Exception {
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(service).deleteJob(1L);
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs/1"))
@@ -115,26 +117,31 @@ public class JobControllerTest {
String jobName = "jobName";
doNothing().when(service).deleteJob(jobName);
- mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName", jobName))
+ mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName"
+ , jobName))
.andExpect(status().isNoContent());
}
@Test
public void testDeleteJobByNameForFailureWithNotFound() throws Exception {
String jobName = "jobName";
- doThrow(new GriffinException.NotFoundException(JOB_NAME_DOES_NOT_EXIST)).when(service).deleteJob(jobName);
+ doThrow(new GriffinException.NotFoundException(JOB_NAME_DOES_NOT_EXIST))
+ .when(service).deleteJob(jobName);
- mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName", jobName))
+ mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName"
+ , jobName))
.andExpect(status().isNotFound());
}
@Test
public void testDeleteJobByNameForFailureWithException() throws Exception {
String jobName = "jobName";
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(service).deleteJob(jobName);
- mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName", jobName))
+ mvc.perform(delete(URLHelper.API_VERSION_PATH + "/jobs").param("jobName"
+ , jobName))
.andExpect(status().isInternalServerError());
}
@@ -142,11 +149,15 @@ public class JobControllerTest {
public void testFindInstancesOfJob() throws Exception {
int page = 0;
int size = 2;
- JobInstanceBean jobInstance = new JobInstanceBean(1L, LivySessionStates.State.RUNNING, "", "", null, null);
- given(service.findInstancesOfJob(1L, page, size)).willReturn(Arrays.asList(jobInstance));
-
- mvc.perform(get(URLHelper.API_VERSION_PATH + "/jobs/instances").param("jobId", String.valueOf(1L))
- .param("page", String.valueOf(page)).param("size", String.valueOf(size)))
+ JobInstanceBean jobInstance = new JobInstanceBean(1L, LivySessionStates
+ .State.RUNNING, "", "", null, null);
+ given(service.findInstancesOfJob(1L, page, size)).willReturn(Arrays
+ .asList(jobInstance));
+
+ mvc.perform(get(URLHelper.API_VERSION_PATH + "/jobs/instances").param
+ ("jobId", String.valueOf(1L))
+ .param("page", String.valueOf(page)).param("size",
+ String.valueOf(size)))
.andExpect(status().isOk())
.andExpect(jsonPath("$.[0].state", is("RUNNING")));
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
index 0887b0a..7ef743b 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
@@ -66,15 +66,18 @@ public class JobInstanceBeanRepoTest {
@Test
public void testFindByJobIdWithPageable() {
- Pageable pageRequest = new PageRequest(0, 10, Sort.Direction.DESC, "tms");
- List<JobInstanceBean> instances = jobInstanceRepo.findByJobId(1L, pageRequest);
+ Pageable pageRequest = new PageRequest(0, 10, Sort.Direction.DESC,
+ "tms");
+ List<JobInstanceBean> instances = jobInstanceRepo.findByJobId(1L,
+ pageRequest);
assertEquals(3, instances.size());
}
@Test
public void testFindByActiveState() {
- LivySessionStates.State[] states = {STARTING, NOT_STARTED, RECOVERING, IDLE, RUNNING, BUSY};
+ LivySessionStates.State[] states = {STARTING, NOT_STARTED, RECOVERING,
+ IDLE, RUNNING, BUSY};
List<JobInstanceBean> list = jobInstanceRepo.findByActiveState(states);
assertEquals(1, list.size());
}
@@ -82,14 +85,20 @@ public class JobInstanceBeanRepoTest {
private void setEntityManager() {
VirtualJob job = new VirtualJob();
- JobInstanceBean instance1 = new JobInstanceBean(1L, LivySessionStates.State.SUCCESS,
- "appId1", "http://domain.com/uri1", System.currentTimeMillis(), System.currentTimeMillis());
+ JobInstanceBean instance1 = new JobInstanceBean(1L, LivySessionStates
+ .State.SUCCESS,
+ "appId1", "http://domain.com/uri1", System.currentTimeMillis(),
+ System.currentTimeMillis());
instance1.setJob(job);
- JobInstanceBean instance2 = new JobInstanceBean(2L, LivySessionStates.State.ERROR,
- "appId2", "http://domain.com/uri2", System.currentTimeMillis(), System.currentTimeMillis());
+ JobInstanceBean instance2 = new JobInstanceBean(2L, LivySessionStates
+ .State.ERROR,
+ "appId2", "http://domain.com/uri2", System.currentTimeMillis(),
+ System.currentTimeMillis());
instance2.setJob(job);
- JobInstanceBean instance3 = new JobInstanceBean(2L, LivySessionStates.State.STARTING,
- "appId3", "http://domain.com/uri3", System.currentTimeMillis(), System.currentTimeMillis());
+ JobInstanceBean instance3 = new JobInstanceBean(2L, LivySessionStates
+ .State.STARTING,
+ "appId3", "http://domain.com/uri3", System.currentTimeMillis(),
+ System.currentTimeMillis());
instance3.setJob(job);
entityManager.persistAndFlush(job);
entityManager.persistAndFlush(instance1);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
index 4209294..d20cf3e 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
@@ -73,7 +73,8 @@ public class JobInstanceTest {
@Bean(name = "appConf")
public Properties sparkJobProps() {
String path = "application.properties";
- return PropertiesUtil.getProperties(path, new ClassPathResource(path));
+ return PropertiesUtil.getProperties(path,
+ new ClassPathResource(path));
}
@Bean(name = "schedulerFactoryBean")
@@ -119,15 +120,19 @@ public class JobInstanceTest {
given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure);
given(repo.findOne(Matchers.anyLong())).willReturn(job);
given(factory.getScheduler()).willReturn(scheduler);
- given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers);
- given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false);
+ given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(
+ JobKey.class))).willReturn(triggers);
+ given(scheduler.checkExists(Matchers.any(TriggerKey.class)))
+ .willReturn(false);
given(jobRepo.save(Matchers.any(BatchJob.class))).willReturn(job);
- given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false);
+ given(scheduler.checkExists(Matchers.any(JobKey.class)))
+ .willReturn(false);
jobInstance.execute(context);
verify(measureRepo, times(1)).findOne(Matchers.anyLong());
verify(factory, times(4)).getScheduler();
- verify(scheduler, times(1)).getTriggersOfJob(Matchers.any(JobKey.class));
+ verify(scheduler, times(1)).getTriggersOfJob(Matchers.any(
+ JobKey.class));
}
@SuppressWarnings("unchecked")
@@ -143,10 +148,13 @@ public class JobInstanceTest {
given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure);
given(jobRepo.findOne(Matchers.anyLong())).willReturn(job);
given(factory.getScheduler()).willReturn(scheduler);
- given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers);
- given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false);
+ given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(
+ JobKey.class))).willReturn(triggers);
+ given(scheduler.checkExists(Matchers.any(TriggerKey.class)))
+ .willReturn(false);
given(jobRepo.save(Matchers.any(BatchJob.class))).willReturn(job);
- given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false);
+ given(scheduler.checkExists(Matchers.any(JobKey.class)))
+ .willReturn(false);
jobInstance.execute(context);
}
@@ -164,10 +172,13 @@ public class JobInstanceTest {
given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure);
given(jobRepo.findOne(Matchers.anyLong())).willReturn(job);
given(factory.getScheduler()).willReturn(scheduler);
- given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers);
- given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false);
+ given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(
+ JobKey.class))).willReturn(triggers);
+ given(scheduler.checkExists(Matchers.any(TriggerKey.class)))
+ .willReturn(false);
given(jobRepo.save(Matchers.any(BatchJob.class))).willReturn(job);
- given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false);
+ given(scheduler.checkExists(Matchers.any(JobKey.class)))
+ .willReturn(false);
jobInstance.execute(context);
verify(context, times(1)).getJobDetail();
@@ -189,10 +200,13 @@ public class JobInstanceTest {
given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure);
given(jobRepo.findOne(Matchers.anyLong())).willReturn(job);
given(factory.getScheduler()).willReturn(scheduler);
- given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers);
- given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false);
+ given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(
+ JobKey.class))).willReturn(triggers);
+ given(scheduler.checkExists(Matchers.any(TriggerKey.class)))
+ .willReturn(false);
given(jobRepo.save(Matchers.any(BatchJob.class))).willReturn(job);
- given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false);
+ given(scheduler.checkExists(Matchers.any(JobKey.class)))
+ .willReturn(false);
jobInstance.execute(context);
verify(context, times(1)).getJobDetail();
@@ -206,4 +220,4 @@ public class JobInstanceTest {
assertTrue(true);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
index ff93b0c..1a5c5a9 100644
--- a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
@@ -67,7 +67,8 @@ public class SparkSubmitJobTest {
@Bean(name = "livyConf")
public Properties sparkJobProps() {
String path = "sparkJob.properties";
- return PropertiesUtil.getProperties(path, new ClassPathResource(path));
+ return PropertiesUtil.getProperties(path,
+ new ClassPathResource(path));
}
}
@@ -93,20 +94,24 @@ public class SparkSubmitJobTest {
}
@Test
- public void testExecuteWithPredicateTriggerGreaterThanRepeat() throws Exception {
+ public void testExecuteWithPredicateTriggerGreaterThanRepeat()
+ throws Exception {
JobExecutionContext context = mock(JobExecutionContext.class);
JobInstanceBean instance = createJobInstance();
GriffinMeasure measure = createGriffinMeasure("measureName");
SegmentPredicate predicate = createFileExistPredicate();
- JobDetail jd = createJobDetail(JsonUtil.toJson(measure), JsonUtil.toJson(Collections.singletonList(predicate)));
+ JobDetail jd = createJobDetail(JsonUtil.toJson(measure), JsonUtil.toJson
+ (Collections.singletonList(predicate)));
given(context.getJobDetail()).willReturn(jd);
given(context.getTrigger()).willReturn(createSimpleTrigger(4, 5));
- given(jobInstanceRepo.findByPredicateName(Matchers.anyString())).willReturn(instance);
+ given(jobInstanceRepo.findByPredicateName(Matchers.anyString()))
+ .willReturn(instance);
sparkSubmitJob.execute(context);
verify(context, times(1)).getJobDetail();
- verify(jobInstanceRepo, times(1)).findByPredicateName(Matchers.anyString());
+ verify(jobInstanceRepo, times(1)).findByPredicateName(
+ Matchers.anyString());
}
@Test
@@ -116,35 +121,42 @@ public class SparkSubmitJobTest {
JobInstanceBean instance = createJobInstance();
GriffinMeasure measure = createGriffinMeasure("measureName");
SegmentPredicate predicate = createFileExistPredicate();
- JobDetail jd = createJobDetail(JsonUtil.toJson(measure), JsonUtil.toJson(Collections.singletonList(predicate)));
+ JobDetail jd = createJobDetail(JsonUtil.toJson(measure), JsonUtil.toJson
+ (Collections.singletonList(predicate)));
given(context.getJobDetail()).willReturn(jd);
given(context.getTrigger()).willReturn(createSimpleTrigger(4, 4));
- given(jobInstanceRepo.findByPredicateName(Matchers.anyString())).willReturn(instance);
+ given(jobInstanceRepo.findByPredicateName(Matchers.anyString()))
+ .willReturn(instance);
sparkSubmitJob.execute(context);
verify(context, times(1)).getJobDetail();
- verify(jobInstanceRepo, times(1)).findByPredicateName(Matchers.anyString());
+ verify(jobInstanceRepo, times(1)).findByPredicateName(
+ Matchers.anyString());
}
@Test
public void testExecuteWithNoPredicateSuccess() throws Exception {
- String result = "{\"id\":1,\"state\":\"starting\",\"appId\":null,\"appInfo\":{\"driverLogUrl\":null,\"sparkUiUrl\":null},\"log\":[]}";
+ String result = "{\"id\":1,\"state\":\"starting\",\"appId\":null," +
+ "\"appInfo\":{\"driverLogUrl\":null," +
+ "\"sparkUiUrl\":null},\"log\":[]}";
JobExecutionContext context = mock(JobExecutionContext.class);
JobInstanceBean instance = createJobInstance();
GriffinMeasure measure = createGriffinMeasure("measureName");
JobDetail jd = createJobDetail(JsonUtil.toJson(measure), "");
given(context.getJobDetail()).willReturn(jd);
- given(jobInstanceRepo.findByPredicateName(Matchers.anyString())).willReturn(instance);
+ given(jobInstanceRepo.findByPredicateName(Matchers.anyString()))
+ .willReturn(instance);
Whitebox.setInternalState(sparkSubmitJob, "restTemplate", restTemplate);
- given(restTemplate.postForObject(Matchers.anyString(), Matchers.any(), Matchers.any())).willReturn(result);
- //doNothing().when(jobService).pauseJob(Matchers.any(), Matchers.any());
+ given(restTemplate.postForObject(Matchers.anyString(), Matchers.any(),
+ Matchers.any())).willReturn(result);
sparkSubmitJob.execute(context);
verify(context, times(1)).getJobDetail();
- verify(jobInstanceRepo, times(1)).findByPredicateName(Matchers.anyString());
+ verify(jobInstanceRepo, times(1)).findByPredicateName(
+ Matchers.anyString());
}
@Test
@@ -155,11 +167,13 @@ public class SparkSubmitJobTest {
GriffinMeasure measure = createGriffinMeasure("measureName");
JobDetail jd = createJobDetail(JsonUtil.toJson(measure), "");
given(context.getJobDetail()).willReturn(jd);
- given(jobInstanceRepo.findByPredicateName(Matchers.anyString())).willReturn(instance);
+ given(jobInstanceRepo.findByPredicateName(Matchers.anyString()))
+ .willReturn(instance);
sparkSubmitJob.execute(context);
verify(context, times(1)).getJobDetail();
- verify(jobInstanceRepo, times(1)).findByPredicateName(Matchers.anyString());
+ verify(jobInstanceRepo, times(1)).findByPredicateName(
+ Matchers.anyString());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
index ef227bd..76b81df 100644
--- a/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
@@ -66,7 +66,8 @@ public class JobInstanceRepoTest {
@Test
public void testFindByActiveState() {
- State[] states = {STARTING, NOT_STARTED, RECOVERING, IDLE, RUNNING, BUSY};
+ State[] states = {STARTING, NOT_STARTED, RECOVERING, IDLE, RUNNING,
+ BUSY};
List<JobInstanceBean> beans = jobInstanceRepo.findByActiveState(states);
assertThat(beans.size()).isEqualTo(1);
}
@@ -79,7 +80,8 @@ public class JobInstanceRepoTest {
@Test
public void testFindByExpireTmsLessThanEqual() {
- List<JobInstanceBean> beans = jobInstanceRepo.findByExpireTmsLessThanEqual(1516004640092L);
+ List<JobInstanceBean> beans = jobInstanceRepo
+ .findByExpireTmsLessThanEqual(1516004640092L);
assertThat(beans.size()).isEqualTo(2);
}
@@ -127,4 +129,4 @@ public class JobInstanceRepoTest {
entityManager.persistAndFlush(bean3);
entityManager.persistAndFlush(bean4);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
index ba98533..2b775c8 100644
--- a/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
@@ -68,7 +68,8 @@ public class JobRepoTest {
@Test
public void findByJobNameAndDeleted() {
- List<AbstractJob> jobs = jobRepo.findByJobNameAndDeleted("griffinJobName1", false);
+ List<AbstractJob> jobs = jobRepo
+ .findByJobNameAndDeleted("griffinJobName1", false);
assertEquals(jobs.size(), 1);
}
@@ -85,8 +86,10 @@ public class JobRepoTest {
}
public void setEntityManager() {
- AbstractJob job1 = new BatchJob(1L, "griffinJobName1", "qName1", "qGroup1", false);
- AbstractJob job2 = new BatchJob(1L, "griffinJobName2", "qName2", "qGroup2", false);
+ AbstractJob job1 = new BatchJob(1L, "griffinJobName1", "qName1",
+ "qGroup1", false);
+ AbstractJob job2 = new BatchJob(1L, "griffinJobName2", "qName2",
+ "qGroup2", false);
AbstractJob job3 = new VirtualJob("virtualJobName1", 1L, "metricName1");
AbstractJob job4 = new VirtualJob("virtualJobName2", 1L, "metricName2");
entityManager.persistAndFlush(job1);
@@ -94,4 +97,4 @@ public class JobRepoTest {
entityManager.persistAndFlush(job3);
entityManager.persistAndFlush(job4);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImplTest.java
index 01c958f..be59ef0 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImplTest.java
@@ -57,7 +57,8 @@ public class ExternalMeasureOperatorImplTest {
public void testCreateForSuccess() {
ExternalMeasure measure = createExternalMeasure("view_item_hourly");
given(measureRepo.save(measure)).willReturn(measure);
- given(jobRepo.save(Matchers.any(VirtualJob.class))).willReturn(new VirtualJob());
+ given(jobRepo.save(Matchers.any(VirtualJob.class))).willReturn(
+ new VirtualJob());
operator.create(measure);
verify(jobRepo, times(1)).save(new VirtualJob());
@@ -76,10 +77,12 @@ public class ExternalMeasureOperatorImplTest {
ExternalMeasure measure = createExternalMeasure("view_item_hourly");
measure.setId(1L);
given(measureRepo.findOne(1L)).willReturn(measure);
- given(measureRepo.save(Matchers.any(ExternalMeasure.class))).willReturn(measure);
+ given(measureRepo.save(Matchers.any(ExternalMeasure.class)))
+ .willReturn(measure);
operator.create(measure);
- verify(measureRepo, times(1)).save(Matchers.any(ExternalMeasure.class));
+ verify(measureRepo, times(1)).save(
+ Matchers.any(ExternalMeasure.class));
}
@Test(expected = GriffinException.BadRequestException.class)
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImplTest.java
index 70a4562..957ea01 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImplTest.java
@@ -72,9 +72,12 @@ public class GriffinMeasureOperatorImplTest {
@Test(expected = GriffinException.BadRequestException.class)
public void testCreateForFailureWithConnectorNull() throws Exception {
String measureName = "view_item_hourly";
- DataConnector dcSource = createDataConnector(null, "default", "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#");
- DataConnector dcTarget = createDataConnector(null, "default", "test_data_tgt", "dt=#YYYYMMdd# AND hour=#HH#");
- GriffinMeasure measure = createGriffinMeasure(measureName, dcSource, dcTarget);
+ DataConnector dcSource = createDataConnector(null, "default",
+ "test_data_src", "dt=#YYYYMMdd# AND hour =#HH#");
+ DataConnector dcTarget = createDataConnector(null, "default",
+ "test_data_tgt", "dt=#YYYYMMdd# AND hour =#HH#");
+ GriffinMeasure measure = createGriffinMeasure(measureName, dcSource,
+ dcTarget);
operator.create(measure);
}
@@ -103,7 +106,8 @@ public class GriffinMeasureOperatorImplTest {
public void testDeleteForFailureWithPauseJob() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
measure.setId(1L);
- doThrow(new GriffinException.ServiceException("Service exception", new RuntimeException()))
+ doThrow(new GriffinException.ServiceException("Service exception",
+ new RuntimeException()))
.when(jobService).deleteJobsRelateToMeasure(1L);
operator.delete(measure);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
index b50fd4e..54f2372 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
@@ -77,7 +77,8 @@ public class MeasureControllerTest {
@Test
public void testGetAllMeasures() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
- Mockito.<List<? extends Measure>>when(service.getAllAliveMeasures("")).thenReturn(Collections.singletonList(measure));
+ Mockito.<List<? extends Measure>>when(service.getAllAliveMeasures(""))
+ .thenReturn(Collections.singletonList(measure));
mvc.perform(get(URLHelper.API_VERSION_PATH + "/measures"))
.andExpect(status().isOk())
@@ -105,7 +106,8 @@ public class MeasureControllerTest {
@Test
public void testDeleteMeasureByIdForNotFound() throws Exception {
- doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST))
+ doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage
+ .MEASURE_ID_DOES_NOT_EXIST))
.when(service).deleteMeasureById(1L);
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures/1"))
@@ -113,8 +115,10 @@ public class MeasureControllerTest {
}
@Test
- public void testDeleteMeasureByIdForGriffinFailureWithException() throws Exception {
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ public void testDeleteMeasureByIdForGriffinFailureWithException() throws
+ Exception {
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(service).deleteMeasureById(1L);
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures/1"))
@@ -131,7 +135,8 @@ public class MeasureControllerTest {
@Test
public void testDeleteMeasuresForNotFound() throws Exception {
- doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST))
+ doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage
+ .MEASURE_ID_DOES_NOT_EXIST))
.when(service).deleteMeasures();
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures"))
@@ -139,8 +144,10 @@ public class MeasureControllerTest {
}
@Test
- public void testDeleteMeasuresForGriffinFailureWithException() throws Exception {
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ public void testDeleteMeasuresForGriffinFailureWithException()
+ throws Exception {
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(service).deleteMeasures();
mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures"))
@@ -163,7 +170,8 @@ public class MeasureControllerTest {
public void testUpdateMeasureForNotFound() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
String measureJson = JsonUtil.toJson(measure);
- doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST))
+ doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage
+ .MEASURE_ID_DOES_NOT_EXIST))
.when(service).updateMeasure(measure);
mvc.perform(put(URLHelper.API_VERSION_PATH + "/measures")
@@ -175,7 +183,8 @@ public class MeasureControllerTest {
public void testUpdateMeasureForTypeMismatch() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
String measureJson = JsonUtil.toJson(measure);
- doThrow(new GriffinException.BadRequestException(GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_MATCH))
+ doThrow(new GriffinException.BadRequestException(GriffinExceptionMessage
+ .MEASURE_TYPE_DOES_NOT_MATCH))
.when(service).updateMeasure(measure);
mvc.perform(put(URLHelper.API_VERSION_PATH + "/measures")
@@ -191,7 +200,8 @@ public class MeasureControllerTest {
measureList.add(measure);
given(service.getAliveMeasuresByOwner(owner)).willReturn(measureList);
- mvc.perform(get(URLHelper.API_VERSION_PATH + "/measures/owner/" + owner)
+ mvc.perform(get(URLHelper.API_VERSION_PATH
+ + "/measures/owner/" + owner)
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.[0].name", is("view_item_hourly")))
@@ -214,7 +224,8 @@ public class MeasureControllerTest {
public void testCreateNewMeasureForFailWithDuplicate() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
String measureJson = JsonUtil.toJson(measure);
- doThrow(new GriffinException.ConflictException(GriffinExceptionMessage.MEASURE_NAME_ALREADY_EXIST))
+ doThrow(new GriffinException.ConflictException(GriffinExceptionMessage
+ .MEASURE_NAME_ALREADY_EXIST))
.when(service).createMeasure(measure);
mvc.perform(post(URLHelper.API_VERSION_PATH + "/measures")
@@ -226,7 +237,8 @@ public class MeasureControllerTest {
public void testCreateNewMeasureForFailWithInvalidParams() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
String measureJson = JsonUtil.toJson(measure);
- doThrow(new GriffinException.BadRequestException(GriffinExceptionMessage.MISSING_METRIC_NAME))
+ doThrow(new GriffinException.BadRequestException(GriffinExceptionMessage
+ .MISSING_METRIC_NAME))
.when(service).createMeasure(measure);
mvc.perform(post(URLHelper.API_VERSION_PATH + "/measures")
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java
index c5f0f15..fa292d0 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java
@@ -63,7 +63,8 @@ public class MeasureOrgControllerTest {
@Test
public void testGetMetricNameListByOrg() throws Exception {
String org = "hadoop";
- when(measureOrgService.getMetricNameListByOrg(org)).thenReturn(Arrays.asList(org));
+ when(measureOrgService.getMetricNameListByOrg(org)).thenReturn(Arrays
+ .asList(org));
mockMvc.perform(get(URLHelper.API_VERSION_PATH + "/org/{org}", org))
.andExpect(status().isOk())
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java
index 89feed1..ac3d7cf 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java
@@ -52,7 +52,8 @@ public class MeasureOrgServiceImplTest {
@Test
public void testGetOrgs() {
String orgName = "orgName";
- given(measureRepo.findOrganizations(false)).willReturn(Arrays.asList(orgName));
+ given(measureRepo.findOrganizations(false)).willReturn(Arrays
+ .asList(orgName));
List<String> orgs = service.getOrgs();
assertThat(orgs.size()).isEqualTo(1);
assertThat(orgs.get(0)).isEqualTo(orgName);
@@ -62,7 +63,8 @@ public class MeasureOrgServiceImplTest {
public void testGetMetricNameListByOrg() {
String orgName = "orgName";
String measureName = "measureName";
- given(measureRepo.findNameByOrganization(orgName, false)).willReturn(Arrays.asList(measureName));
+ given(measureRepo.findNameByOrganization(orgName, false))
+ .willReturn(Arrays.asList(measureName));
List<String> measureNames = service.getMetricNameListByOrg(orgName);
assertThat(measureNames.size()).isEqualTo(1);
assertThat(measureNames.get(0)).isEqualTo(measureName);
@@ -71,7 +73,8 @@ public class MeasureOrgServiceImplTest {
@Test
public void testGetMeasureNamesGroupByOrg() throws Exception {
GriffinMeasure measure = createGriffinMeasure("measure");
- when(measureRepo.findByDeleted(false)).thenReturn(Arrays.asList(measure));
+ when(measureRepo.findByDeleted(false)).thenReturn(Arrays
+ .asList(measure));
Map<String, List<String>> map = service.getMeasureNamesGroupByOrg();
assertThat(map.size()).isEqualTo(1);
}
@@ -84,13 +87,15 @@ public class MeasureOrgServiceImplTest {
}
@Test
- public void testGetMeasureWithJobDetailsGroupByOrgForSuccess() throws Exception {
+ public void testGetMeasureWithJobDetailsGroupByOrgForSuccess()
+ throws Exception {
String measureName = "measureName";
String measureId = "1";
GriffinMeasure measure = createGriffinMeasure(measureName);
measure.setOrganization("org");
measure.setId(Long.valueOf(measureId));
- given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure));
+ given(measureRepo.findByDeleted(false)).willReturn(Arrays
+ .asList(measure));
Map<String, Object> jobDetail = createJobDetailMap();
@@ -98,18 +103,20 @@ public class MeasureOrgServiceImplTest {
Map<String, List<Map<String, Object>>> measuresById = new HashMap<>();
measuresById.put(measureId, jobList);
- Map<String, Map<String, List<Map<String, Object>>>> map = service.getMeasureWithJobDetailsGroupByOrg(measuresById);
+ Map<String, Map<String, List<Map<String, Object>>>> map = service
+ .getMeasureWithJobDetailsGroupByOrg(measuresById);
assertThat(map.size()).isEqualTo(1);
assertThat(map).containsKey("org");
assertThat(map.get("org").get(measureName)).isEqualTo(jobList);
}
@Test
- public void testGetMeasureWithJobDetailsGroupByOrgForFailure() throws Exception {
+ public void testGetMeasureWithJobDetailsGroupByOrgForFailure()
+ throws Exception {
Map detail = new HashMap();
given(measureRepo.findByDeleted(false)).willReturn(null);
Map map = service.getMeasureWithJobDetailsGroupByOrg(detail);
assert map == null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
index ee4e94a..47c857f 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
@@ -83,7 +83,8 @@ public class MeasureServiceImplTest {
@Test
public void testGetAllMeasures() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
- given(measureRepo.findByDeleted(false)).willReturn(Collections.singletonList(measure));
+ given(measureRepo.findByDeleted(false)).willReturn(Collections
+ .singletonList(measure));
List<? extends Measure> measures = service.getAllAliveMeasures("");
assertEquals(measures.size(), 1);
@@ -109,7 +110,8 @@ public class MeasureServiceImplTest {
public void testGetAliveMeasuresByOwner() throws Exception {
String owner = "test";
Measure measure = createGriffinMeasure("view_item_hourly");
- given(measureRepo.findByOwnerAndDeleted(owner, false)).willReturn(Collections.singletonList(measure));
+ given(measureRepo.findByOwnerAndDeleted(owner, false))
+ .willReturn(Collections.singletonList(measure));
List<Measure> measures = service.getAliveMeasuresByOwner(owner);
assertEquals(measures.get(0).getName(), measure.getName());
@@ -120,7 +122,8 @@ public class MeasureServiceImplTest {
public void testDeleteMeasureByIdForGriffinSuccess() throws Exception {
GriffinMeasure measure = createGriffinMeasure("view_item_hourly");
measure.setId(1L);
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure);
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(measure);
doNothing().when(griffinOp).delete(measure);
service.deleteMeasureById(measure.getId());
@@ -128,10 +131,12 @@ public class MeasureServiceImplTest {
}
@Test
- public void testDeleteMeasureByIdForExternalSuccess() throws SchedulerException {
+ public void testDeleteMeasureByIdForExternalSuccess() throws
+ SchedulerException {
ExternalMeasure measure = createExternalMeasure("externalMeasure");
measure.setId(1L);
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure);
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(measure);
doNothing().when(externalOp).delete(measure);
service.deleteMeasureById(1L);
@@ -139,17 +144,21 @@ public class MeasureServiceImplTest {
}
@Test(expected = GriffinException.NotFoundException.class)
- public void testDeleteMeasureByIdFailureWithNotFound() throws SchedulerException {
+ public void testDeleteMeasureByIdFailureWithNotFound() throws
+ SchedulerException {
given(measureRepo.findByIdAndDeleted(1L, false)).willReturn(null);
service.deleteMeasureById(1L);
}
@Test(expected = GriffinException.ServiceException.class)
- public void testDeleteMeasureByIdForGriffinFailureWithException() throws Exception {
+ public void testDeleteMeasureByIdForGriffinFailureWithException() throws
+ Exception {
GriffinMeasure measure = createGriffinMeasure("externalMeasure");
measure.setId(1L);
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure);
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(measure);
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(griffinOp).delete(measure);
service.deleteMeasureById(1L);
}
@@ -158,7 +167,8 @@ public class MeasureServiceImplTest {
public void testDeleteMeasuresForGriffinSuccess() throws Exception {
GriffinMeasure measure = createGriffinMeasure("view_item_hourly");
measure.setId(1L);
- given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure));
+ given(measureRepo.findByDeleted(false)).willReturn(Arrays
+ .asList(measure));
doNothing().when(griffinOp).delete(measure);
service.deleteMeasures();
}
@@ -167,17 +177,21 @@ public class MeasureServiceImplTest {
public void testDeleteMeasuresForExternalSuccess() throws SchedulerException {
ExternalMeasure measure = createExternalMeasure("externalMeasure");
measure.setId(1L);
- given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure));
+ given(measureRepo.findByDeleted(false)).willReturn(Arrays
+ .asList(measure));
doNothing().when(externalOp).delete(measure);
service.deleteMeasures();
}
@Test(expected = GriffinException.ServiceException.class)
- public void testDeleteMeasuresForGriffinFailureWithException() throws Exception {
+ public void testDeleteMeasuresForGriffinFailureWithException() throws
+ Exception {
GriffinMeasure measure = createGriffinMeasure("externalMeasure");
measure.setId(1L);
- given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure));
- doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception()))
+ given(measureRepo.findByDeleted(false)).willReturn(Arrays
+ .asList(measure));
+ doThrow(new GriffinException.ServiceException("Failed to delete job",
+ new Exception()))
.when(griffinOp).delete(measure);
service.deleteMeasures();
}
@@ -186,7 +200,8 @@ public class MeasureServiceImplTest {
public void testCreateMeasureForGriffinSuccess() throws Exception {
String measureName = "view_item_hourly";
GriffinMeasure griffinMeasure = createGriffinMeasure(measureName);
- given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new ArrayList<>());
+ given(measureRepo.findByNameAndDeleted(measureName, false))
+ .willReturn(new ArrayList<>());
given(griffinOp.create(griffinMeasure)).willReturn(griffinMeasure);
Measure measure = service.createMeasure(griffinMeasure);
@@ -197,7 +212,8 @@ public class MeasureServiceImplTest {
public void testCreateMeasureForExternalSuccess() {
String measureName = "view_item_hourly";
ExternalMeasure externalMeasure = createExternalMeasure(measureName);
- given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new ArrayList<>());
+ given(measureRepo.findByNameAndDeleted(measureName, false))
+ .willReturn(new ArrayList<>());
given(externalOp.create(externalMeasure)).willReturn(externalMeasure);
Measure measure = service.createMeasure(externalMeasure);
assertEquals(measure.getName(), externalMeasure.getName());
@@ -207,7 +223,8 @@ public class MeasureServiceImplTest {
public void testCreateMeasureForFailureWithDuplicate() throws Exception {
String measureName = "view_item_hourly";
GriffinMeasure measure = createGriffinMeasure(measureName);
- given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(Collections.singletonList(measure));
+ given(measureRepo.findByNameAndDeleted(measureName, false))
+ .willReturn(Collections.singletonList(measure));
service.createMeasure(measure);
}
@@ -215,7 +232,8 @@ public class MeasureServiceImplTest {
@Test
public void testUpdateMeasureForGriffinSuccess() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure);
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(measure);
doReturn(measure).when(externalOp).update(measure);
service.updateMeasure(measure);
@@ -223,10 +241,12 @@ public class MeasureServiceImplTest {
}
@Test(expected = GriffinException.BadRequestException.class)
- public void testUpdateMeasureForGriffinFailureWithDiffType() throws Exception {
+ public void testUpdateMeasureForGriffinFailureWithDiffType() throws
+ Exception {
Measure griffinMeasure = createGriffinMeasure("view_item_hourly");
Measure externalMeasure = createExternalMeasure("externalName");
- given(measureRepo.findByIdAndDeleted(griffinMeasure.getId(), false)).willReturn(externalMeasure);
+ given(measureRepo.findByIdAndDeleted(griffinMeasure.getId(), false))
+ .willReturn(externalMeasure);
service.updateMeasure(griffinMeasure);
}
@@ -234,15 +254,18 @@ public class MeasureServiceImplTest {
@Test(expected = GriffinException.NotFoundException.class)
public void testUpdateMeasureForFailureWithNotFound() throws Exception {
Measure measure = createGriffinMeasure("view_item_hourly");
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(null);
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(null);
service.updateMeasure(measure);
}
@Test
public void testUpdateMeasureForExternal() {
- ExternalMeasure measure = createExternalMeasure("external_view_item_hourly");
- given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure);
+ ExternalMeasure measure = createExternalMeasure
+ ("external_view_item_hourly");
+ given(measureRepo.findByIdAndDeleted(measure.getId(), false))
+ .willReturn(measure);
doReturn(measure).when(externalOp).update(measure);
service.updateMeasure(measure);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3bbbcb32/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java b/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
index 6ef7025..66eff16 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
@@ -57,26 +57,31 @@ public class DataConnectorRepoTest {
@Test
public void testFindByConnectorNames() {
- List<DataConnector> connectors = dcRepo.findByConnectorNames(Arrays.asList("name1", "name2"));
+ List<DataConnector> connectors = dcRepo.findByConnectorNames(Arrays
+ .asList("name1", "name2"));
assertEquals(connectors.size(), 2);
}
@Test
public void testFindByConnectorNamesWithEmpty() {
- List<DataConnector> connectors = dcRepo.findByConnectorNames(new ArrayList<>());
+ List<DataConnector> connectors = dcRepo.findByConnectorNames(
+ new ArrayList<>());
assertEquals(connectors.size(), 0);
}
public void setEntityManager() throws Exception {
- DataConnector dc1 = createDataConnector("name1", "database1", "table1", "/dt=#YYYYMM#");
+ DataConnector dc1 = createDataConnector("name1", "database1", "table1",
+ "/dt=#YYYYMM#");
entityManager.persistAndFlush(dc1);
- DataConnector dc2 = createDataConnector("name2", "database2", "table2", "/dt=#YYYYMM#");
+ DataConnector dc2 = createDataConnector("name2", "database2", "table2",
+ "/dt=#YYYYMM#");
entityManager.persistAndFlush(dc2);
- DataConnector dc3 = createDataConnector("name3", "database3", "table3", "/dt=#YYYYMM#");
+ DataConnector dc3 = createDataConnector("name3", "database3", "table3",
+ "/dt=#YYYYMM#");
entityManager.persistAndFlush(dc3);
}
-}
\ No newline at end of file
+}