eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject [26/51] [partial] incubator-eagle git commit: EAGLE-184 Migrate eagle website from https://github.com/eaglemonitoring/eaglemonitoring.github.io to document branch
Date Thu, 03 Mar 2016 18:09:59 GMT
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceAsyncClient.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceAsyncClient.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceAsyncClient.java
deleted file mode 100644
index 48e71f5..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceAsyncClient.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Future;
-
-/**
- * @see IEagleServiceClient
- */
-public interface EagleServiceAsyncClient extends Closeable{
-    /**
-     *
-     * @param <E>
-     * @param entities
-     * @param serviceName
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities,final String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param entityClass
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities,final Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities,final String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities,final Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param request
-     * @return
-     */
-    Future<GenericServiceAPIResponseEntity<String>> delete(final EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException, IOException;
-
-    /**
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities,final String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities,final Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param request
-     * @return
-     */
-    <E extends Object> Future<GenericServiceAPIResponseEntity<String>> search(final EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceClientException.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceClientException.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceClientException.java
deleted file mode 100644
index d3845db..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceClientException.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-/**
- * Default Eagle service client exception class
- */
-public class EagleServiceClientException extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1710851110199812779L;
-
-	/**
-	 * Default constructor of EagleServiceClientException
-	 */
-    public EagleServiceClientException() {
-        super();
-    }
-
-    /**
-     * Constructor of EagleServiceClientException
-     * 
-     * @param message error message
-     */
-    public EagleServiceClientException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor of EagleServiceClientException
-     * 
-     * @param message error message
-     * @param cause the cause of the exception
-     * 
-     */
-    public EagleServiceClientException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructor of EagleServiceClientException
-     * 
-     * @param cause the cause of the exception
-     */
-    public EagleServiceClientException(Throwable cause) {
-        super(cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceConnector.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceConnector.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceConnector.java
deleted file mode 100644
index 2b2b1ac..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceConnector.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.eagle.service.client;
-
-import com.typesafe.config.Config;
-import org.apache.eagle.common.config.EagleConfigConstants;
-
-import java.io.Serializable;
-
-/**
- * Some common codes to enable DAO through eagle service including service host/post, credential population etc.
- */
-public class EagleServiceConnector implements Serializable{
-    private final String eagleServiceHost;
-    private final Integer eagleServicePort;
-    private String username;
-    private String password;
-
-    public String getEagleServiceHost(){
-        return this.eagleServiceHost;
-    }
-
-    public Integer getEagleServicePort(){
-        return this.eagleServicePort;
-    }
-
-    public String getUsername(){
-        return username;
-    }
-
-    public String getPassword(){
-        return password;
-    }
-
-    public EagleServiceConnector(String eagleServiceHost, Integer eagleServicePort) {
-        this(eagleServiceHost, eagleServicePort, null, null);
-    }
-
-    public EagleServiceConnector(String eagleServiceHost, Integer eagleServicePort, String username, String password) {
-        this.eagleServiceHost = eagleServiceHost;
-        this.eagleServicePort = eagleServicePort;
-        this.username = username;
-        this.password = password;
-    }
-
-    public EagleServiceConnector(Config config){
-        this.eagleServiceHost = config.getString(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.HOST);
-        this.eagleServicePort = config.getInt(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.PORT);
-        if (config.hasPath(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.USERNAME) &&
-                config.hasPath(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.PASSWORD)) {
-            this.username = config.getString(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.USERNAME);
-            this.password = config.getString(EagleConfigConstants.EAGLE_PROPS + "." + EagleConfigConstants.EAGLE_SERVICE + "." + EagleConfigConstants.PASSWORD);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceGroupByQueryRequest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceGroupByQueryRequest.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceGroupByQueryRequest.java
deleted file mode 100644
index e9e58c3..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceGroupByQueryRequest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
-
-public class EagleServiceGroupByQueryRequest {
-	
-	private String filter;
-	private String startRowkey;
-	private int pageSize;
-	private String startTime;
-	private String endTime;
-	private List<String> groupBys;
-	private List<String> returns;
-	private List<String> orderBys;
-	private String metricName;
-	private int intervalMin;
-	
-	public String getMetricName() {
-		return metricName;
-	}
-	public void setMetricName(String metricName) {
-		this.metricName = metricName;
-	}
-	public String getFilter() {
-		return filter;
-	}
-	public void setFilter(String filter) {
-		this.filter = filter;
-	}
-	public String getStartRowkey() {
-		return startRowkey;
-	}
-	public void setStartRowkey(String startRowkey) {
-		this.startRowkey = startRowkey;
-	}
-	public int getPageSize() {
-		return pageSize;
-	}
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-	public String getStartTime() {
-		return startTime;
-	}
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
-	}
-	public String getEndTime() {
-		return endTime;
-	}
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
-	public List<String> getGroupBys() {
-		return groupBys;
-	}
-	public void setGroupBys(List<String> groupBys) {
-		this.groupBys = groupBys;
-	}
-	public List<String> getOrderBys() {
-		return orderBys;
-	}
-	public void setOrderBys(List<String> orderBys) {
-		this.orderBys = orderBys;
-	}
-	public List<String> getReturns() {
-		return returns;
-	}
-	public void setReturns(List<String> returns) {
-		this.returns = returns;
-	}
-	
-	public String getQueryParameterString(String service) throws EagleServiceClientException {
-		if (pageSize <= 0) {
-			throw new EagleServiceClientException("pageSize can't be less than 1, pageSize: " + pageSize);
-		}
-		try {
-			final String query = getQuery();
-			final StringBuilder sb = new StringBuilder();
-			// query
-			sb.append("query=").append(service).append(URLEncoder.encode(query, "UTF-8"));
-			// startRowkey
-			if (startRowkey != null) {
-				sb.append("&startRowkey=").append(startRowkey);
-			}
-			// pageSize
-			sb.append("&pageSize=").append(this.pageSize);
-			if (startTime != null || endTime != null) {
-				sb.append("&startTime=").append(URLEncoder.encode(startTime, "UTF-8"));
-				sb.append("&endTime=").append(URLEncoder.encode(endTime, "UTF-8"));
-			}
-			
-			// metricName
-			if(metricName != null){
-				sb.append("&metricName=" + metricName);
-			}
-			
-			if (intervalMin != 0) {
-				sb.append("&timeSeries=true&intervalmin=" + intervalMin);
-			}
-			return sb.toString();
-		} catch (UnsupportedEncodingException e) {
-			throw new EagleServiceClientException("Got an UnsupportedEncodingException" + e.getMessage(), e);
-		}
-	}
-	
-	private String getQuery() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append("[").append(filter).append("]<");
-		boolean first = true;
-		if (groupBys != null && groupBys.size() > 0) {
-			for (String groupBy : groupBys) {
-				if (first) {
-					first = false;
-				} else {
-					sb.append(",");
-				}
-				sb.append("@").append(groupBy);
-			}
-		}
-		sb.append(">{");
-		if (returns != null && returns.size() > 0) {
-			first = true;
-			for (String returnFiled : returns) {
-				if (first) {
-					first = false;
-				} else {
-					sb.append(",");
-				}
-				sb.append(returnFiled);
-			}
-		}
-		sb.append("}");
-		if (orderBys != null && orderBys.size() > 0) {
-			sb.append(".{");
-			first = true;
-			for (String orderBy : orderBys) {
-				if (first) {
-					first = false;
-				} else {
-					sb.append(",");
-				}
-				sb.append(orderBy);
-			}
-			sb.append("}");
-		}
-		return sb.toString();
-	}
-	public int getIntervalMin() {
-		return intervalMin;
-	}
-	public void setIntervalMin(int intervalMin) {
-		this.intervalMin = intervalMin;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryBuilder.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryBuilder.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryBuilder.java
deleted file mode 100644
index 106ebc6..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryBuilder.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Builder helper class to create EagleServiceQueryRequest
- */
-public final class EagleServiceQueryBuilder {
-
-	private final EagleServiceQueryRequest request = new EagleServiceQueryRequest();
-	
-	public EagleServiceQueryBuilder addSearchTag(String tagKey, String tagValue) throws EagleServiceClientException {
-		if (tagKey == null || tagValue == null) {
-			throw new EagleServiceClientException("tagKey or tagValue is null, tagKey: " + tagKey + ", tagValue: " + tagValue);
-		}
-		List<EagleServiceQueryRequest.Tag> searchTags = request.getSearchTags();
-		if (searchTags == null) {
-			searchTags = new ArrayList<EagleServiceQueryRequest.Tag>();
-			request.setSearchTags(searchTags);
-		}
-		if (!containsTag(tagKey, tagValue)) {
-			final EagleServiceQueryRequest.Tag tag = new EagleServiceQueryRequest.Tag();
-			tag.setKey(tagKey);
-			tag.setValue(tagValue);
-			searchTags.add(tag);
-		}
-		return this;
-	}
-	
-	public EagleServiceQueryRequest buildRequest() throws EagleServiceClientException {
-		return request;
-	}
-	
-	public EagleServiceQueryBuilder setStartTime(long startTime) {
-		request.setStartTime(startTime);
-		return this;
-	}
-	
-	public EagleServiceQueryBuilder setEndTime(long endTime) {
-		request.setEndTime(endTime);
-		return this;
-	}
-	
-	public EagleServiceQueryBuilder setPageSize(int pageSize) throws EagleServiceClientException {
-		if (pageSize <= 0) {
-			throw new EagleServiceClientException("pageSize can't be less than 1");
-		}
-		request.setPageSize(pageSize);
-		return this;
-	}
-
-	public EagleServiceQueryBuilder addReturnTag(String tagKey) throws EagleServiceClientException {
-		if (tagKey == null) {
-			throw new EagleServiceClientException("tagKey can't be null");
-		}
-		List<String> returnTags = request.getReturnTags();
-		if (returnTags == null) {
-			returnTags = new ArrayList<String>();
-			request.setReturnTags(returnTags);
-		}
-		if (!returnTags.contains(tagKey)) {
-			returnTags.add(tagKey);
-		}
-		return this;
-	}
-	
-	public EagleServiceQueryBuilder addReturnField(String field) throws EagleServiceClientException {
-		if (field == null) {
-			throw new EagleServiceClientException("field can't be null");
-		}
-		List<String> returnFields = request.getReturnFields();
-		if (returnFields == null) {
-			returnFields = new ArrayList<String>();
-			request.setReturnFields(returnFields);
-		}
-		if (!returnFields.contains(field)) {
-			returnFields.add(field);
-		}
-		return this;
-	}
-
-	private boolean containsTag(String tagKey, String tagValue) {
-		for (EagleServiceQueryRequest.Tag tag : request.getSearchTags()) {
-			if (tag.getKey().equals(tagKey) && tag.getValue().equals(tagValue)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryRequest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryRequest.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryRequest.java
deleted file mode 100644
index 37dcb44..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceQueryRequest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import org.apache.eagle.common.config.EagleConfigFactory;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Eagle service query parameter request
- */
-public class EagleServiceQueryRequest {
-
-	// instance members
-	private long startTime;
-	private long endTime;
-	private int pageSize;
-	private List<Tag> searchTags;
-	private List<String> returnTags;
-	private List<String> returnFields;
-
-	public static class Tag {
-		private String key;
-		private String value;
-		
-		public String getKey() {
-			return key;
-		}
-		public void setKey(String key) {
-			this.key = key;
-		}
-		public String getValue() {
-			return value;
-		}
-		public void setValue(String value) {
-			this.value = value;
-		}
-	}
-
-	public long getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(long startTime) {
-		this.startTime = startTime;
-	}
-
-	public long getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(long endTime) {
-		this.endTime = endTime;
-	}
-
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public List<Tag> getSearchTags() {
-		return searchTags;
-	}
-
-	public void setSearchTags(List<Tag> searchTags) {
-		this.searchTags = searchTags;
-	}
-
-	public List<String> getReturnTags() {
-		return returnTags;
-	}
-
-	public void setReturnTags(List<String> returnTags) {
-		this.returnTags = returnTags;
-	}
-
-	public List<String> getReturnFields() {
-		return returnFields;
-	}
-
-	public void setReturnFields(List<String> returnFields) {
-		this.returnFields = returnFields;
-	}
-
-	public String getQueryParameterString() throws EagleServiceClientException {
-		if (pageSize <= 0) {
-			throw new EagleServiceClientException("pageSize can't be less than 1, pageSize: " + pageSize);
-		}
-		if (startTime > endTime || (startTime == endTime && startTime != 0)) {
-			throw new EagleServiceClientException("Invalid startTime and endTime, startTime: " + startTime + ", endTime: " + endTime);
-		}
-		int returnSize = 0;
-		if (returnTags != null) {
-			returnSize += returnTags.size();
-		}
-		if (returnFields != null) {
-			returnSize += returnFields.size();
-		}
-		if (returnSize == 0) {
-			throw new EagleServiceClientException("Invalid request, no return tag or field added");
-		}
-		final StringBuilder sb = new StringBuilder();
-		sb.append("pageSize=").append(this.pageSize);
-		if (endTime > 0) {
-			final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd%20HH:mm:ss");
-            format.setTimeZone(EagleConfigFactory.load().getTimeZone());
-			Date date = new Date(startTime);
-			String timeString = format.format(date);
-			sb.append("&startTime=").append(timeString);
-			date.setTime(endTime);
-			timeString = format.format(date);
-			sb.append("&endTime=").append(timeString);
-		}
-		if (searchTags != null) {
-			for (Tag tag : searchTags) {
-				sb.append("&tagNameValue=").append(tag.getKey()).append("%3D").append(tag.getValue());
-			}
-		}
-		if (returnTags != null) {
-			for (String tagKey : returnTags) {
-				sb.append("&outputTag=").append(tagKey);
-			}
-		}
-		if (returnFields != null) {
-			for (String field : returnFields) {
-				sb.append("&outputField=").append(field);
-			}
-		}
-		return sb.toString();
-	}
-	
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceSingleEntityQueryRequest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceSingleEntityQueryRequest.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceSingleEntityQueryRequest.java
deleted file mode 100755
index 58b2764..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/EagleServiceSingleEntityQueryRequest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import org.apache.eagle.common.config.EagleConfigFactory;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class EagleServiceSingleEntityQueryRequest {
-	private String query;
-	private String startRowkey;
-	private int pageSize;
-	private long startTime;
-	private long endTime;
-	private boolean treeAgg;
-	private String metricName;
-	private boolean filterIfMissing;
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    private boolean verbose;
-	
-	public String getMetricName() {
-		return metricName;
-	}
-
-	public void setMetricName(String metricName) {
-		this.metricName = metricName;
-	}
-
-	public String getQuery() {
-		return query;
-	}
-
-	public void setQuery(String query) {
-		this.query = query;
-	}
-
-	public String getStartRowkey() {
-		return startRowkey;
-	}
-
-	public void setStartRowkey(String startRowkey) {
-		this.startRowkey = startRowkey;
-	}
-
-	public boolean isTreeAgg() {
-		return treeAgg;
-	}
-
-	public void setTreeAgg(boolean treeAgg) {
-		this.treeAgg = treeAgg;
-	}
-
-	public long getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(long startTime) {
-		this.startTime = startTime;
-	}
-
-	public long getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(long endTime) {
-		this.endTime = endTime;
-	}
-
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-	
-	public boolean getFilterIfMissing() {
-		return filterIfMissing;
-	}
-
-	public void setFilterIfMissing(boolean filterIfMissing) {
-		this.filterIfMissing = filterIfMissing;
-	}
-
-	public String getQueryParameterString() throws EagleServiceClientException {
-		if (pageSize < 0) {
-			throw new EagleServiceClientException("pageSize can't be less than 0, pageSize: " + pageSize);
-		}
-
-		// startTime and endTime is optional
-		
-		final StringBuilder sb = new StringBuilder();
-		// query
-//        try {
-//            sb.append("query=").append(URLEncoder.encode(query,"UTF-8"));
-            sb.append("query=").append(query);
-//        } catch (UnsupportedEncodingException e) {
-//            throw new EagleServiceClientException(e);
-//        }
-
-        // startRowkey
-		if (startRowkey != null) {
-			sb.append("&startRowkey=").append(startRowkey);
-		}
-		// pageSize
-		sb.append("&pageSize=").append(this.pageSize);
-		if (startTime !=0 || endTime != 0) {
-			Date date = new Date(startTime);
-			SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd%20HH:mm:ss");
-            dateFormatter.setTimeZone(EagleConfigFactory.load().getTimeZone());
-			String timeString = dateFormatter.format(date);
-			sb.append("&startTime=").append(timeString);
-			date.setTime(endTime);
-			timeString = dateFormatter.format(date);
-			sb.append("&endTime=").append(timeString);
-		}
-		// tree aggregate
-		sb.append("&treeAgg=").append(treeAgg);
-		
-		// for metric read
-		if(metricName != null){
-			sb.append("&metricName=").append(metricName);
-		}
-		
-		if (filterIfMissing == true) { 
-			sb.append("&filterIfMissing=").append("true");
-		}
-		return sb.toString();
-	}
-
-    public static Builder build(){
-        return new Builder();
-    }
-
-    public static class Builder{
-        private final EagleServiceSingleEntityQueryRequest rawQuery;
-        public Builder(){
-            this.rawQuery= new EagleServiceSingleEntityQueryRequest();
-        }
-        public EagleServiceSingleEntityQueryRequest done(){
-            return this.rawQuery;
-        }
-        public Builder query(String query) {
-            this.rawQuery.setQuery(query);
-            return this;
-        }
-
-        public Builder startTime(long startTime) {
-            this.rawQuery.setStartTime(startTime);
-            return this;
-        }
-
-        public Builder endTime(long endTime) {
-            this.rawQuery.setEndTime(endTime);
-            return this;
-        }
-
-        public Builder pageSize(int pageSize) {
-            this.rawQuery.setPageSize(pageSize);
-            return this;
-        }
-
-        public Builder startRowkey(String startRowkey) {
-            this.rawQuery.setStartRowkey(startRowkey);
-            return this;
-        }
-
-        public Builder treeAgg(boolean treeAgg) {
-            this.rawQuery.setTreeAgg(treeAgg);
-            return this;
-        }
-
-        public Builder filerIfMissing(boolean filterIfMissing) {
-            this.rawQuery.setFilterIfMissing(filterIfMissing);
-            return this;
-        }
-
-        public Builder metricName(String metricName) {
-            this.rawQuery.setMetricName(metricName);
-            return this;
-        }
-
-        public Builder verbose(Boolean verbose) {
-            this.rawQuery.setVerbose(verbose);
-            return this;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceClient.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceClient.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceClient.java
deleted file mode 100644
index ce62eee..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceClient.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-import com.sun.jersey.api.client.Client;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-
-public interface IEagleServiceClient extends IEagleServiceRequestBuilder, Closeable {
-
-    Client getJerseyClient();
-
-    IEagleServiceClient silence(boolean silence);
-
-    /**
-     *
-     * @param <E>
-     * @param entities
-     * @param serviceName
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> create(List<E> entities,String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param entityClass
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> create(List<E> entities,Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> create(List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> delete(List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> delete(List<E> entities,String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> delete(List<E> entities,Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param request
-     * @return
-     */
-    GenericServiceAPIResponseEntity<String> delete(EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException, IOException;
-
-    /**
-     *
-     * @param ids
-     * @param serviceName
-     * @return
-     * @throws EagleServiceClientException
-     * @throws IOException
-     */
-    GenericServiceAPIResponseEntity<String> deleteById(List<String> ids,String serviceName) throws EagleServiceClientException, IOException;
-
-    /**
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> update(List<E> entities) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> update(List<E> entities,String serviceName) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param entities
-     * @param <E>
-     * @return
-     */
-    <E extends TaggedLogAPIEntity> GenericServiceAPIResponseEntity<String> update(List<E> entities,Class<E> entityClass) throws IOException, EagleServiceClientException;
-
-    /**
-     *
-     * @param request
-     * @return
-     */
-    <E extends Object> GenericServiceAPIResponseEntity<E> search(EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException;
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceRequestBuilder.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceRequestBuilder.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceRequestBuilder.java
deleted file mode 100644
index 1264b30..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/IEagleServiceRequestBuilder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import org.apache.eagle.service.client.impl.*;
-
-/**
- *
- * IEagleServiceClient extension interfaces
- *
- * @see IEagleServiceClient
- */
-public interface IEagleServiceRequestBuilder {
-    /**
-     * Search pipe API
-     *
-     * @return
-     */
-    SearchRequestBuilder search();
-
-    /**
-     * Search pipe API
-     *
-     * @param query
-     * @return
-     */
-    SearchRequestBuilder search(String query);
-
-    /**
-     *
-     * Delete pipe API
-     *
-     * @return
-     */
-    DeleteRequestBuilder delete();
-
-    /**
-     * Metric sender
-     *
-     * @param metricName
-     * @return
-     */
-    MetricSender metric(String metricName);
-
-    /**
-     * Batch entities sender
-     *
-     * @param batchSize
-     * @return
-     */
-    BatchSender batch(int batchSize);
-
-    /**
-     * Async service client requester
-     *
-     * @return
-     */
-    EagleServiceAsyncClient async();
-
-    /**
-     * Parallel service client requester
-     *
-     * @param parallelNum
-     * @return
-     */
-    ConcurrentSender parallel(int parallelNum);
-
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListGroupByQueryAPIResponseEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListGroupByQueryAPIResponseEntity.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListGroupByQueryAPIResponseEntity.java
deleted file mode 100644
index e59513b..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListGroupByQueryAPIResponseEntity.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.util.List;
-import java.util.Map;
-
-public class ListGroupByQueryAPIResponseEntity {
-
-	private boolean success;
-	private String exception;
-	private int totalResults;
-	private long elapsedms;
-	private List<Entry> obj;
-	private long lastTimestamp;
-
-	public long getElapsedms() {
-		return elapsedms;
-	}
-	public void setElapsedms(long elapsedms) {
-		this.elapsedms = elapsedms;
-	}
-	public boolean isSuccess() {
-		return success;
-	}
-	public void setSuccess(boolean success) {
-		this.success = success;
-	}
-	public String getException() {
-		return exception;
-	}
-	public void setException(String exception) {
-		this.exception = exception;
-	}
-	public int getTotalResults() {
-		return totalResults;
-	}
-	public void setTotalResults(int totalResults) {
-		this.totalResults = totalResults;
-	}
-	public List<Entry> getObj() {
-		return obj;
-	}
-	public void setObj(List<Entry> obj) {
-		this.obj = obj;
-	}
-	
-	public long getLastTimestamp() {
-		return lastTimestamp;
-	}
-
-	public void setLastTimestamp(long lastTimestamp) {
-		this.lastTimestamp = lastTimestamp;
-	}
-
-	public static class Entry implements Map.Entry<List<String>, List<Double>> {
-
-		private List<String> key;
-		private List<Double> value;
-		public List<String> getKey() {
-			return key;
-		}
-		public void setKey(List<String> key) {
-			this.key = key;
-		}
-		public List<Double> getValue() {
-			return value;
-		}
-		@Override
-		public List<Double> setValue(List<Double> value) {
-			List<Double> old = this.value;
-			this.value = value;
-			return old;
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java
deleted file mode 100644
index 3e71f4e..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.ListQueryAPIResponseEntity;
-
-/**
- * TODO: It's just a temporary solution. We need fix jersy and jackson mapping issue so the class
- * can be safely removed. 
- *
- */
-public final class ListQueryAPIResponseConvertHelper {
-
-	
-	private static final Map<Class<?>, Map<String, Method>> BEAN_SETTER_MAP = new ConcurrentHashMap<Class<?>, Map<String, Method>>();
-	private static final String SETTER_PREFIX = "set";
-	
-	@SuppressWarnings({ "unchecked" })
-	public static ListQueryAPIResponseEntity convert(Class<? extends TaggedLogAPIEntity> clazz, ListQueryAPIResponseEntity response) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, JsonGenerationException, JsonMappingException, IOException {
-		if (response == null || response.getObj() == null) {
-			return response;
-		}
-		final List<TaggedLogAPIEntity> entities = new ArrayList<TaggedLogAPIEntity>();
-		final Object obj = response.getObj();
-		final Map<String, Method> settings = getOrCreateSetterMap(clazz);
-		final Collection<Map<String, Object>> objs = (Collection<Map<String, Object>>) obj;
-		for (Map<String, Object> map : objs) {
-			final TaggedLogAPIEntity entity = clazz.newInstance();
-			for (Map.Entry<String, Object> entry : map.entrySet()) {
-				final String propertyName = entry.getKey();
-				Object value = entry.getValue();
-				final Method method = settings.get(propertyName);
-				final Type type = method.getGenericParameterTypes()[0];
-				if ((type == double.class || type == Double.class || type == long.class || type == Long.class)
-					&& (value.equals("NaN"))) {
-					value = 0;
-				}					
-				
-				final Class<?> parameterClass = method.getParameterTypes()[0];
-				if (value instanceof Number || value instanceof String || parameterClass.isInstance(value)) {
-					try {
-						method.invoke(entity, value);
-					}
-					catch (Exception e){
-						e.printStackTrace();
-					}
-				} else {
-					ObjectMapper om = new ObjectMapper();
-					String objJson = om.writeValueAsString(value);
-					value = om.readValue(objJson, parameterClass);
-					method.invoke(entity, value);
-				}
-			}
-			entities.add(entity);
-		}
-		response.setObj(entities);
-		return response;
-	}
-	
-	private static Map<String, Method> getOrCreateSetterMap(Class<?> clazz) {
-		Map<String, Method> setterMap = BEAN_SETTER_MAP.get(clazz);
-		if (setterMap == null) {
-			setterMap = createSetterMap(clazz);
-		}
-		return setterMap;
-	}
-
-	private static Map<String, Method> createSetterMap(Class<?> clazz) {
-		final Map<String, Method> setterMap = new HashMap<String, Method>();
-		final Method[] methods = clazz.getMethods();
-		final StringBuilder sb = new StringBuilder(100);
-		for (Method m : methods) {
-			final String methodName = m.getName();
-			if (methodName.startsWith(SETTER_PREFIX) && methodName.length() > SETTER_PREFIX.length()) {
-				sb.setLength(0);
-				final char c = methodName.charAt(3);
-				sb.append(Character.toLowerCase(c));
-				sb.append(methodName.substring(4));
-				String propertyName = sb.toString(); 
-				setterMap.put(propertyName, m);
-			}
-		}
-		BEAN_SETTER_MAP.put(clazz, setterMap);
-		return setterMap;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java
deleted file mode 100644
index 80c6aeb..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.util.List;
-import java.util.Map;
-
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-
-@JsonPropertyOrder({ "success", "exception", "elapsems", "totalResults", "elapsedms", "obj" })
-public class ListTimeSeriesQueryAPIResponseEntity {
-
-	private boolean success;
-	private String exception;
-	private int totalResults;
-	private long elapsedms;
-	private List<Entry> obj;
-
-	public long getElapsedms() {
-		return elapsedms;
-	}
-	public void setElapsedms(long elapsedms) {
-		this.elapsedms = elapsedms;
-	}
-	public boolean isSuccess() {
-		return success;
-	}
-	public void setSuccess(boolean success) {
-		this.success = success;
-	}
-	public String getException() {
-		return exception;
-	}
-	public void setException(String exception) {
-		this.exception = exception;
-	}
-	public int getTotalResults() {
-		return totalResults;
-	}
-	public void setTotalResults(int totalResults) {
-		this.totalResults = totalResults;
-	}
-	public List<Entry> getObj() {
-		return obj;
-	}
-	public void setObj(List<Entry> obj) {
-		this.obj = obj;
-	}
-	
-	public static class Entry implements Map.Entry<List<String>, List<double[]>> {
-
-		private List<String> key;
-		private List<double[]> value;
-		public List<String> getKey() {
-			return key;
-		}
-		public void setKey(List<String> key) {
-			this.key = key;
-		}
-		public List<double[]> getValue() {
-			return value;
-		}
-		@Override
-		public List<double[]> setValue(List<double[]> value) {
-			List<double[]> old = this.value;
-			this.value = value;
-			return old;
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java
deleted file mode 100644
index 7dc39f0..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.RowkeyQueryAPIResponseEntity;
-
-/**
- * TODO: It's just a temporary solution. We need fix jersy and jackson mapping issue so the class
- * can be safely removed. 
- *
- */
-public final class RowkeyQueryAPIResponseConvertHelper {
-
-	
-	private static final Map<Class<?>, Map<String, Method>> BEAN_SETTER_MAP = new ConcurrentHashMap<Class<?>, Map<String, Method>>();
-	private static final String SETTER_PREFIX = "set";
-	
-	@SuppressWarnings({ "unchecked" })
-	public static RowkeyQueryAPIResponseEntity convert(Class<? extends TaggedLogAPIEntity> clazz, RowkeyQueryAPIResponseEntity response) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, JsonGenerationException, JsonMappingException, IOException {
-		if (response == null || response.getObj() == null) {
-			return response;
-		}		
-		final Object obj = response.getObj();
-		final Map<String, Method> settings = getOrCreateSetterMap(clazz);
-		final Map<String, Object> map = (Map<String, Object>) obj;
-		final TaggedLogAPIEntity entity = clazz.newInstance();
-		for (Map.Entry<String, Object> entry : map.entrySet()) {
-			final String propertyName = entry.getKey();
-			Object value = entry.getValue();
-			final Method method = settings.get(propertyName);
-			final Type type = method.getGenericParameterTypes()[0];
-			if ((type == double.class || type == Double.class || type == long.class || type == Long.class)
-				&& (value.equals("NaN"))) {
-				value = 0;
-			}					
-			
-			final Class<?> parameterClass = method.getParameterTypes()[0];
-			if (value instanceof Number || value instanceof String || parameterClass.isInstance(value)) {
-				try {
-					method.invoke(entity, value);
-				}
-				catch (Exception e){
-					e.printStackTrace();
-				}
-			} else {
-				ObjectMapper om = new ObjectMapper();
-				String objJson = om.writeValueAsString(value);
-				value = om.readValue(objJson, parameterClass);
-				method.invoke(entity, value);
-			}
-		}
-		response.setObj(entity);
-		return response;
-	}
-	
-	private static Map<String, Method> getOrCreateSetterMap(Class<?> clazz) {
-		Map<String, Method> setterMap = BEAN_SETTER_MAP.get(clazz);
-		if (setterMap == null) {
-			setterMap = createSetterMap(clazz);
-		}
-		return setterMap;
-	}
-
-	private static Map<String, Method> createSetterMap(Class<?> clazz) {
-		final Map<String, Method> setterMap = new HashMap<String, Method>();
-		final Method[] methods = clazz.getMethods();
-		final StringBuilder sb = new StringBuilder(100);
-		for (Method m : methods) {
-			final String methodName = m.getName();
-			if (methodName.startsWith(SETTER_PREFIX) && methodName.length() > SETTER_PREFIX.length()) {
-				sb.setLength(0);
-				final char c = methodName.charAt(3);
-				sb.append(Character.toLowerCase(c));
-				sb.append(methodName.substring(4));
-				String propertyName = sb.toString(); 
-				setterMap.put(propertyName, m);
-			}
-		}
-		BEAN_SETTER_MAP.put(clazz, setterMap);
-		return setterMap;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ServiceConfig.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ServiceConfig.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ServiceConfig.java
deleted file mode 100644
index 1dbf75b..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ServiceConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- *
- */
-
-package org.apache.eagle.service.client;
-
-import java.io.Serializable;
-
-public class ServiceConfig implements Serializable{
-    public String serviceHost;
-    public Integer servicePort;
-    public String username;
-    public String password;
-
-    public ServiceConfig() {
-
-    }
-
-    public ServiceConfig(String serviceHost, Integer servicePort, String username, String password) {
-        this.serviceHost = serviceHost;
-        this.servicePort = servicePort;
-        this.username = username;
-        this.password = password;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java
deleted file mode 100644
index e1d6618..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * 
- */
-package org.apache.eagle.service.client;
-
-import java.util.List;
-import java.util.Map;
-
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-//@JsonPropertyOrder({ "success", "exception", "elapsems", "totalResults", "elapsedms", "obj", "lastTimestamp" })
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class TimeSeriesGroupByAPIResponseEntity {
-	private boolean success;
-	private String exception;
-	private int totalResults;
-	private long elapsedms;
-	private List<Entry> obj;
-	private long lastTimestamp;
-
-	public long getElapsedms() {
-		return elapsedms;
-	}
-	public void setElapsedms(long elapsedms) {
-		this.elapsedms = elapsedms;
-	}
-	
-	public boolean isSuccess() {
-		return success;
-	}
-	public void setSuccess(boolean success) {
-		this.success = success;
-	}
-	public String getException() {
-		return exception;
-	}
-	public void setException(String exception) {
-		this.exception = exception;
-	}
-	public int getTotalResults() {
-		return totalResults;
-	}
-	public void setTotalResults(int totalResults) {
-		this.totalResults = totalResults;
-	}
-	public List<Entry> getObj() {
-		return obj;
-	}
-	public void setObj(List<Entry> obj) {
-		this.obj = obj;
-	}
-	
-	public long getLastTimestamp() {
-		return lastTimestamp;
-	}
-	public void setLastTimestamp(long lastTimestamp) {
-		this.lastTimestamp = lastTimestamp;
-	}
-
-	public static class Entry implements Map.Entry<List<String>, List<Double[]>> {
-
-		private List<String> key;
-		private List<Double[]> value;
-		public List<String> getKey() {
-			return key;
-		}
-		public void setKey(List<String> key) {
-			this.key = key;
-		}
-
-		@Override
-		public List<Double[]> getValue() {
-			return value;
-		}
-
-		@Override
-		public List<Double[]> setValue(List<Double[]> value) {
-			List<Double[]> old = this.value;
-			this.value = value;
-			return old;
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/BatchSender.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/BatchSender.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/BatchSender.java
deleted file mode 100644
index ba3e6ab..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/BatchSender.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client.impl;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-import org.apache.eagle.service.client.IEagleServiceClient;
-import org.apache.eagle.service.client.EagleServiceClientException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class BatchSender implements Closeable {
-    private final static Logger LOG = LoggerFactory.getLogger(BatchSender.class);
-    private final List<TaggedLogAPIEntity> entityBucket;
-    private final IEagleServiceClient client;
-
-    protected int getBatchSize() {
-        return batchSize;
-    }
-
-    protected void setBatchSize(int batchSize) {
-        if(batchSize<0) throw new IllegalArgumentException("batch size should be "+batchSize);
-        this.batchSize = batchSize;
-    }
-
-    private int batchSize;
-
-    public BatchSender(IEagleServiceClient client, int batchSize){
-        this.setBatchSize(batchSize);
-        this.client = client;
-        this.entityBucket = new LinkedList<TaggedLogAPIEntity>();
-    }
-
-    public BatchSender send(TaggedLogAPIEntity entity) throws IOException, EagleServiceClientException {
-        this.entityBucket.add(entity);
-        if(this.entityBucket.size()>=this.batchSize){
-            flush();
-        }
-        return this;
-    }
-
-    public BatchSender send(List<TaggedLogAPIEntity> entities) throws IOException, EagleServiceClientException {
-        this.entityBucket.addAll(entities);
-        if(this.entityBucket.size()>= this.batchSize){
-            flush();
-        }
-        return this;
-    }
-
-    public void flush() throws IOException, EagleServiceClientException {
-        if(this.entityBucket.size() == 0 && LOG.isDebugEnabled()){
-            LOG.debug("No entities to flush");
-            return;
-        }
-
-        LOG.info("Writing "+this.entityBucket.size()+" entities");
-        GenericServiceAPIResponseEntity<String> response = this.client.create(this.entityBucket);
-        if(!response.isSuccess()){
-            LOG.error("Got service exception: "+response.getException());
-            throw new IOException("Service exception"+response.getException());
-        }else{
-            this.entityBucket.clear();
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            flush();
-        } catch (EagleServiceClientException e) {
-            throw new IOException(e);
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/ConcurrentSender.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/ConcurrentSender.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/ConcurrentSender.java
deleted file mode 100644
index 0c2aad0..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/ConcurrentSender.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client.impl;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.service.client.EagleServiceClientException;
-import org.apache.eagle.service.client.IEagleServiceClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.SynchronousQueue;
-
-public class ConcurrentSender implements Closeable{
-    private final int parallelNum;
-    private final IEagleServiceClient client;
-    private final SynchronousQueue<TaggedLogAPIEntity> queue;
-    private final List<Handler> handlers;
-    private int batchSize = 1000;
-    private long batchInterval = 3 * 1000;
-    private boolean isStarted = false;
-
-    private final static Logger LOG = LoggerFactory.getLogger(ConcurrentSender.class);
-
-    public ConcurrentSender(IEagleServiceClient client, int parallelNum) {
-        this.parallelNum = parallelNum;
-        this.client = client;
-        this.queue= new SynchronousQueue<TaggedLogAPIEntity>();
-        this.handlers = Collections.synchronizedList(new LinkedList<Handler>());
-    }
-
-    public void start(){
-        if(!this.isStarted) {
-            LOG.info("Starting with handlers = " + this.parallelNum + ", batchSize = " + this.batchSize + ", batchInterval (ms) = " + this.batchInterval);
-
-            for (int i = 0; i < this.parallelNum; i++) {
-                Handler handler = new Handler(this.queue, this.client, this.batchSize, this.batchInterval);
-
-                Thread thread = new Thread(handler);
-                thread.setDaemon(true);
-                thread.setName("Sender-" + i);
-                this.handlers.add(handler);
-                thread.start();
-            }
-
-            this.isStarted = true;
-        }else{
-            LOG.warn("Already started");
-        }
-    }
-
-    public ConcurrentSender batchSize(int batchSize){
-        this.batchSize = batchSize;
-        return this;
-    }
-
-    public ConcurrentSender batchInterval(long batchInterval){
-        this.batchInterval = batchInterval;
-        return this;
-    }
-
-    public ConcurrentSender send(final List<? extends TaggedLogAPIEntity> entities) throws InterruptedException {
-        for(TaggedLogAPIEntity entity:entities){
-            this.send(entity);
-        }
-        return this;
-    }
-
-    public ConcurrentSender send(final TaggedLogAPIEntity entity) throws InterruptedException {
-        if(!this.isStarted){
-            this.start();
-        }
-        this.queue.put(entity);
-        return this;
-    }
-
-    @Override
-    public void close() throws IOException {
-        for(Handler handler: handlers){
-            handler.close();
-        }
-    }
-
-    private class Handler extends BatchSender implements Runnable{
-        private final long batchInterval;
-        private final SynchronousQueue<TaggedLogAPIEntity> localQueue;
-
-        private boolean isStopped;
-        private long lastFlushTime;
-
-        public Handler(SynchronousQueue<TaggedLogAPIEntity> queue, IEagleServiceClient client, int batchSize, long batchInterval) {
-            super(client, batchSize);
-            this.localQueue = queue;
-            this.batchInterval = batchInterval;
-        }
-
-        @Override
-        public void run() {
-            if(LOG.isDebugEnabled()) LOG.debug("Starting ...");
-            lastFlushTime = System.currentTimeMillis();
-
-            while(!isStopped){
-                TaggedLogAPIEntity entity = null;
-                try {
-                    entity = this.localQueue.take();
-                } catch (InterruptedException e) {
-                    LOG.error(e.getMessage(),e);
-                }
-
-                if(entity!=null){
-                    try {
-                        this.send(entity);
-                    } catch (IOException e) {
-                        LOG.error(e.getMessage(),e);
-                    } catch (EagleServiceClientException e) {
-                        LOG.error(e.getMessage(),e);
-                    }
-                    long currentTimestamp = System.currentTimeMillis();
-
-                    if((currentTimestamp - this.lastFlushTime) >= this.batchInterval){
-                        if(LOG.isDebugEnabled())
-                            LOG.info(String.format("%s - %s >= %s",currentTimestamp,this.lastFlushTime,this.batchInterval));
-
-                        try {
-                            this.flush();
-                        } catch (IOException e) {
-                            LOG.error(e.getMessage(),e);
-                        } catch (EagleServiceClientException e) {
-                            LOG.error(e.getMessage(),e);
-                        }
-                    }
-                }else{
-                    LOG.warn("Got null entity");
-                }
-            }
-
-            if(LOG.isDebugEnabled()) LOG.debug("Stopping ...");
-        }
-
-        @Override
-        public void close() throws IOException {
-            this.isStopped = true;
-            super.close();
-        }
-
-        @Override
-        public void flush() throws IOException, EagleServiceClientException {
-            super.flush();
-            this.lastFlushTime = System.currentTimeMillis();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/DeleteRequestBuilder.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/DeleteRequestBuilder.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/DeleteRequestBuilder.java
deleted file mode 100644
index ba708d6..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/DeleteRequestBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client.impl;
-
-import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-import org.apache.eagle.service.client.EagleServiceClientException;
-import org.apache.eagle.service.client.EagleServiceSingleEntityQueryRequest;
-import org.apache.eagle.service.client.IEagleServiceClient;
-import org.apache.eagle.common.DateTimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
-
-public class DeleteRequestBuilder {
-    private final IEagleServiceClient client;
-    private List<String> deleteIds = null;
-    private EagleServiceSingleEntityQueryRequest request;
-
-    private final static Logger LOG = LoggerFactory.getLogger(DeleteRequestBuilder.class);
-    private String serviceName;
-
-    public DeleteRequestBuilder(IEagleServiceClient client){
-        this.client = client;
-    }
-
-    public DeleteRequestBuilder byId(List<String> ids){
-        this.deleteIds = ids;
-        return this;
-    }
-
-    public DeleteRequestBuilder byQuery(String query){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        try {
-            this.request.setQuery(URLEncoder.encode(query, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            LOG.error(e.getMessage(),e);
-        }
-        return this;
-    }
-
-    public DeleteRequestBuilder serviceName(String serviceName){
-        this.serviceName = serviceName;
-        return this;
-    }
-
-    public DeleteRequestBuilder startRowkey(String startRowkey){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setStartRowkey(startRowkey);
-        return this;
-    }
-
-    public DeleteRequestBuilder pageSize(int pageSize){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setPageSize(pageSize);
-        return this;
-    }
-
-    public DeleteRequestBuilder startTime(long startTime){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setStartTime(startTime);
-        return this;
-    }
-
-    public DeleteRequestBuilder startTime(String startTime){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setStartTime(DateTimeUtil.humanDateToMillisecondsWithoutException(startTime));
-        return this;
-    }
-
-    public DeleteRequestBuilder endTime(long endTime){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setEndTime(endTime);
-        return this;
-    }
-
-    public DeleteRequestBuilder endTime(String endTime){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setEndTime(DateTimeUtil.humanDateToMillisecondsWithoutException(endTime));
-        return this;
-    }
-
-    public DeleteRequestBuilder timeRange(String startTime,String endTime){
-        this.startTime(startTime);
-        this.endTime(endTime);
-        return this;
-    }
-
-    public DeleteRequestBuilder timeRange(long startTime,long endTime){
-        this.startTime(startTime);
-        this.endTime(endTime);
-        return this;
-    }
-
-    public DeleteRequestBuilder treeAgg(boolean treeAgg){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setTreeAgg(treeAgg);
-        return this;
-    }
-
-    public DeleteRequestBuilder metricName(String metricName){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setMetricName(metricName);
-        return this;
-    }
-
-    public DeleteRequestBuilder filterIfMissing(Boolean filterIfMissing){
-        if(this.request==null)  this.request = new EagleServiceSingleEntityQueryRequest();
-        this.request.setFilterIfMissing(filterIfMissing);
-        return this;
-    }
-
-    public GenericServiceAPIResponseEntity<String> send() throws EagleServiceClientException, IOException {
-        if(this.deleteIds!=null){
-            return client.deleteById(this.deleteIds,this.serviceName);
-        }else {
-            return client.delete(this.request);
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0ea130ef/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/EagleServiceAsyncClientImpl.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/EagleServiceAsyncClientImpl.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/EagleServiceAsyncClientImpl.java
deleted file mode 100644
index 7bdfab8..0000000
--- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/impl/EagleServiceAsyncClientImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.client.impl;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-import org.apache.eagle.service.client.EagleServiceAsyncClient;
-import org.apache.eagle.service.client.IEagleServiceClient;
-import org.apache.eagle.service.client.EagleServiceClientException;
-import org.apache.eagle.service.client.EagleServiceSingleEntityQueryRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-
-public class EagleServiceAsyncClientImpl implements EagleServiceAsyncClient {
-    private final IEagleServiceClient client;
-    private final static Logger LOG = LoggerFactory.getLogger(EagleServiceAsyncClientImpl.class);
-
-    public EagleServiceAsyncClientImpl(IEagleServiceClient client) {
-        this.client = client;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if(LOG.isDebugEnabled()) LOG.debug("Executor service is shutting down");
-        this.client.getJerseyClient().getExecutorService().shutdown();
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities, final String serviceName) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.create(entities,serviceName);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities, final Class<E> entityClass) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.create(entities,entityClass);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> create(final List<E> entities) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.create(entities);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.delete(entities);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities, final String serviceName) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.delete(entities, serviceName);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> delete(final List<E> entities, final Class<E> entityClass) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.create(entities,entityClass);
-            }
-        });
-    }
-
-    @Override
-    public Future<GenericServiceAPIResponseEntity<String>> delete(final EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException, IOException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.delete(request);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.update(entities);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities, final String serviceName) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.update(entities, serviceName);
-            }
-        });
-    }
-
-    @Override
-    public <E extends TaggedLogAPIEntity> Future<GenericServiceAPIResponseEntity<String>> update(final List<E> entities, final Class<E> entityClass) throws IOException, EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.update(entities, entityClass);
-            }
-        });
-    }
-
-    @Override
-    public <E> Future<GenericServiceAPIResponseEntity<String>> search(final EagleServiceSingleEntityQueryRequest request) throws EagleServiceClientException {
-        return this.client.getJerseyClient().getExecutorService().submit(new Callable<GenericServiceAPIResponseEntity<String>>() {
-            @Override
-            public GenericServiceAPIResponseEntity<String> call() throws Exception {
-                return client.search(request);
-            }
-        });
-    }
-}
\ No newline at end of file



Mime
View raw message