Repository: lens Updated Branches: refs/heads/master 44a266a0f -> d78766c66
LENS-1415: Make ResultRow implement Serializable Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d78766c6 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d78766c6 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d78766c6 Branch: refs/heads/master Commit: d78766c667dc9438ea1cd79aaf1c746c05e0f8ca Parents: 44a266a Author: Rajat Khandelwal <pro...@apache.org> Authored: Tue May 2 13:47:16 2017 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Tue May 2 13:47:16 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/lens/api/query/QueryResult.java | 6 ++++-- .../org/apache/lens/api/query/QueryResultSetMetadata.java | 3 ++- .../main/java/org/apache/lens/api/query/ResultColumn.java | 4 +++- .../java/org/apache/lens/api/query/ResultColumnType.java | 4 +++- .../src/main/java/org/apache/lens/api/query/ResultRow.java | 3 ++- .../src/main/java/org/apache/lens/regression/util/Util.java | 9 ++++----- 6 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-api/src/main/java/org/apache/lens/api/query/QueryResult.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/QueryResult.java b/lens-api/src/main/java/org/apache/lens/api/query/QueryResult.java index db91e41..0180617 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/QueryResult.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/QueryResult.java @@ -21,6 +21,8 @@ */ package org.apache.lens.api.query; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; @@ -35,9 +37,9 @@ import lombok.NoArgsConstructor; */ @XmlRootElement @XmlSeeAlso({PersistentQueryResult.class, InMemoryQueryResult.class}) -/** +/* * Instantiates a new query result. */ @NoArgsConstructor(access = AccessLevel.PROTECTED) -public abstract class QueryResult extends ToYAMLString implements PrettyPrintable { +public abstract class QueryResult extends ToYAMLString implements PrettyPrintable, Serializable { } http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-api/src/main/java/org/apache/lens/api/query/QueryResultSetMetadata.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/QueryResultSetMetadata.java b/lens-api/src/main/java/org/apache/lens/api/query/QueryResultSetMetadata.java index dbdc677..67d9fb6 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/QueryResultSetMetadata.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/QueryResultSetMetadata.java @@ -21,6 +21,7 @@ */ package org.apache.lens.api.query; +import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlElement; @@ -49,7 +50,7 @@ import lombok.NoArgsConstructor; * Instantiates a new query result set metadata. */ @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class QueryResultSetMetadata extends ToYAMLString { +public class QueryResultSetMetadata extends ToYAMLString implements Serializable { /** * The columns. http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-api/src/main/java/org/apache/lens/api/query/ResultColumn.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/ResultColumn.java b/lens-api/src/main/java/org/apache/lens/api/query/ResultColumn.java index ecf4713..b3c3869 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/ResultColumn.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/ResultColumn.java @@ -21,6 +21,8 @@ */ package org.apache.lens.api.query; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -46,7 +48,7 @@ import lombok.NoArgsConstructor; * Instantiates a new result column. */ @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ResultColumn { +public class ResultColumn implements Serializable { /** * The name. http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-api/src/main/java/org/apache/lens/api/query/ResultColumnType.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/ResultColumnType.java b/lens-api/src/main/java/org/apache/lens/api/query/ResultColumnType.java index c71d02e..9df6597 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/ResultColumnType.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/ResultColumnType.java @@ -21,6 +21,8 @@ */ package org.apache.lens.api.query; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlRootElement; @@ -29,7 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement @XmlEnum -public enum ResultColumnType { +public enum ResultColumnType implements Serializable { /** * The boolean. http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-api/src/main/java/org/apache/lens/api/query/ResultRow.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/ResultRow.java b/lens-api/src/main/java/org/apache/lens/api/query/ResultRow.java index b8bad60..1377e12 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/ResultRow.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/ResultRow.java @@ -21,6 +21,7 @@ */ package org.apache.lens.api.query; +import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlElementWrapper; @@ -46,7 +47,7 @@ import lombok.NoArgsConstructor; * Instantiates a new result row. */ @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ResultRow { +public class ResultRow implements Serializable { /** * The values. http://git-wip-us.apache.org/repos/asf/lens/blob/d78766c6/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java ---------------------------------------------------------------------- diff --git a/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java b/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java index f662490..80ba912 100644 --- a/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java +++ b/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java @@ -80,7 +80,6 @@ public class Util { private static String localFile; private static String backupFile; - private static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(Util.class); private Util() { @@ -461,13 +460,13 @@ public class Util { value = xpath.compile(xmlPathExpr).evaluate(doc); } catch (ParserConfigurationException e) { - logger.info(e); + log.error("error", e); } catch (SAXException e) { - logger.info(e); + log.error("error", e); } catch (IOException e) { - logger.info(e); + log.error("error", e); } catch (XPathExpressionException e) { - logger.info(e); + log.error("error", e); } return value; }
