You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/08/11 14:20:57 UTC
[34/50] [abbrv] incubator-lens git commit: LENS-709 : Removes code
which is only present for java6 compatibility
LENS-709 : Removes code which is only present for java6 compatibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/f9b0b356
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/f9b0b356
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/f9b0b356
Branch: refs/heads/current-release-line
Commit: f9b0b356d75666c50de3dfe367b5cb8b3595d2dc
Parents: b8db174
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Thu Aug 6 10:18:58 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Aug 6 10:18:58 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/lens/ml/impl/LensMLImpl.java | 2 +-
.../java/org/apache/lens/ml/server/MLServiceImpl.java | 2 +-
.../org/apache/lens/ml/server/MLServiceResource.java | 2 +-
.../java/org/apache/lens/server/BaseLensService.java | 2 +-
.../org/apache/lens/server/LensApplicationListener.java | 2 +-
.../java/org/apache/lens/server/LensRequestListener.java | 6 +++---
.../src/main/java/org/apache/lens/server/LensServer.java | 9 ++++-----
.../main/java/org/apache/lens/server/LensServices.java | 9 +++------
.../apache/lens/server/metastore/MetastoreResource.java | 2 +-
.../apache/lens/server/metrics/MetricsServiceImpl.java | 6 +++---
.../org/apache/lens/server/query/QueryEndNotifier.java | 2 +-
.../lens/server/query/QueryExecutionServiceImpl.java | 4 ++--
.../apache/lens/server/query/QueryServiceResource.java | 2 +-
.../org/apache/lens/server/query/ResultFormatter.java | 2 +-
.../lens/server/session/DatabaseResourceService.java | 2 +-
.../apache/lens/server/session/HiveSessionService.java | 3 ++-
.../org/apache/lens/server/session/SessionResource.java | 2 +-
.../org/apache/lens/server/stats/StatisticsService.java | 7 +++----
.../lens/server/stats/store/log/LogStatisticsStore.java | 2 +-
.../stats/store/log/StatisticsLogFileScannerTask.java | 2 +-
.../stats/store/log/StatisticsLogPartitionHandler.java | 2 +-
.../org/apache/lens/server/ui/MetastoreUIResource.java | 2 +-
.../apache/lens/server/ui/QueryServiceUIResource.java | 2 +-
.../org/apache/lens/server/ui/SessionUIResource.java | 2 +-
.../test/java/org/apache/lens/server/LensJerseyTest.java | 2 +-
.../java/org/apache/lens/server/TestLensApplication.java | 2 +-
.../java/org/apache/lens/server/TestServerRestart.java | 11 ++++++-----
.../java/org/apache/lens/server/TestServiceProvider.java | 4 ++--
.../lens/server/metastore/TestMetastoreService.java | 3 ++-
.../lens/server/metrics/TestResourceMethodMetrics.java | 5 +++--
.../java/org/apache/lens/server/query/TestLensDAO.java | 3 ++-
.../lens/server/query/TestQueryEndEmailNotifier.java | 3 ++-
.../org/apache/lens/server/query/TestQueryService.java | 5 +++--
.../apache/lens/server/query/TestResultFormatting.java | 6 ++----
.../apache/lens/server/session/TestSessionExpiry.java | 4 ++--
.../apache/lens/server/session/TestSessionResource.java | 4 ++--
36 files changed, 65 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
index 5938f8a..e090e68 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
@@ -710,7 +710,7 @@ public class LensMLImpl implements LensML {
private class UDFStatusExpiryRunnable implements Runnable {
public void run() {
try {
- SessionService sessionService = (SessionService) MLUtils.getServiceProvider().getService(SessionService.NAME);
+ SessionService sessionService = MLUtils.getServiceProvider().getService(SessionService.NAME);
// Clear status of sessions which are closed.
List<LensSessionHandle> sessions = new ArrayList<LensSessionHandle>(predictUdfStatus.keySet());
for (LensSessionHandle sessionHandle : sessions) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
index ff046c7..fcbc9ea 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
@@ -282,7 +282,7 @@ public class MLServiceImpl extends CompositeService implements MLService {
@Override
public QueryHandle runQuery(String testQuery) throws LensException {
// Run the query in query executions service
- QueryExecutionService queryService = (QueryExecutionService) getServiceProvider().getService("query");
+ QueryExecutionService queryService = getServiceProvider().getService(QueryExecutionService.NAME);
LensConf queryConf = new LensConf();
queryConf.addProperty(LensConfConstants.QUERY_PERSISTENT_RESULT_SET, false + "");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
index ac2957d..53bac7d 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
@@ -111,7 +111,7 @@ public class MLServiceResource {
private MLService getMlService() {
if (mlService == null) {
- mlService = (MLService) getServiceProvider().getService(MLService.NAME);
+ mlService = getServiceProvider().getService(MLService.NAME);
}
return mlService;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/BaseLensService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/BaseLensService.java b/lens-server/src/main/java/org/apache/lens/server/BaseLensService.java
index da11069..1487c5a 100644
--- a/lens-server/src/main/java/org/apache/lens/server/BaseLensService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/BaseLensService.java
@@ -161,7 +161,7 @@ public abstract class BaseLensService extends CompositeService implements Extern
}
protected LensEventService getEventService() {
- LensEventService eventService = (LensEventService) LensServices.get().getService(LensEventService.NAME);
+ LensEventService eventService = LensServices.get().getService(LensEventService.NAME);
if (eventService == null) {
throw new NullPointerException("Could not get event service");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/LensApplicationListener.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensApplicationListener.java b/lens-server/src/main/java/org/apache/lens/server/LensApplicationListener.java
index 2b3f7e3..7460c48 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensApplicationListener.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensApplicationListener.java
@@ -50,7 +50,7 @@ public class LensApplicationListener implements ApplicationEventListener {
public RequestEventListener onRequest(RequestEvent requestEvent) {
// Request start events are sent to application listener and not request listener
if (RequestEvent.Type.START == requestEvent.getType()) {
- MetricsService metricsSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricsSvc = LensServices.get().getService(MetricsService.NAME);
if (metricsSvc != null) {
metricsSvc.incrCounter(LensRequestListener.class, LensRequestListener.HTTP_REQUESTS_STARTED);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/LensRequestListener.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensRequestListener.java b/lens-server/src/main/java/org/apache/lens/server/LensRequestListener.java
index cb226d5..e846267 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensRequestListener.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensRequestListener.java
@@ -96,7 +96,7 @@ public class LensRequestListener implements RequestEventListener {
Throwable error = event.getException();
if (error != null) {
Class<?> errorClass = error.getClass();
- MetricsService metrics = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metrics = LensServices.get().getService(MetricsService.NAME);
if (metrics != null) {
// overall error counter
metrics.incrCounter(LensRequestListener.class, HTTP_ERROR);
@@ -121,7 +121,7 @@ public class LensRequestListener implements RequestEventListener {
}
break;
case FINISHED:
- MetricsService metrics = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metrics = LensServices.get().getService(MetricsService.NAME);
if (metrics != null) {
metrics.incrCounter(LensRequestListener.class, HTTP_REQUESTS_FINISHED);
}
@@ -145,7 +145,7 @@ public class LensRequestListener implements RequestEventListener {
}
private MethodMetricsContext getContext(RequestEvent event) {
- MetricsService metricsSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricsSvc = LensServices.get().getService(MetricsService.NAME);
return metricsSvc.getMethodMetricsContext(event.getUriInfo().getMatchedResourceMethod(),
event.getContainerRequest());
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/LensServer.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServer.java b/lens-server/src/main/java/org/apache/lens/server/LensServer.java
index 0da37ad..55332e2 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServer.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServer.java
@@ -44,7 +44,6 @@ import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.bridge.SLF4JBridgeHandler;
import com.codahale.metrics.servlets.AdminServlet;
-
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -89,10 +88,10 @@ public class LensServer {
serverList.add(server);
WebappContext adminCtx = new WebappContext("admin", "");
- adminCtx.setAttribute("com.codahale.metrics.servlets.MetricsServlet.registry", ((MetricsServiceImpl) LensServices
- .get().getService(MetricsService.NAME)).getMetricRegistry());
- adminCtx.setAttribute("com.codahale.metrics.servlets.HealthCheckServlet.registry",
- ((MetricsServiceImpl) LensServices.get().getService(MetricsService.NAME)).getHealthCheck());
+ MetricsServiceImpl metricsService = LensServices.get().getService(MetricsService.NAME);
+ adminCtx
+ .setAttribute("com.codahale.metrics.servlets.MetricsServlet.registry", (metricsService.getMetricRegistry()));
+ adminCtx.setAttribute("com.codahale.metrics.servlets.HealthCheckServlet.registry", metricsService.getHealthCheck());
final ServletRegistration sgMetrics = adminCtx.addServlet("admin", new AdminServlet());
sgMetrics.addMapping("/admin/*");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/LensServices.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
index c4a61c8..48b3e00 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
@@ -20,10 +20,7 @@ package org.apache.lens.server;
import static org.apache.lens.server.api.LensConfConstants.*;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
import java.lang.reflect.Constructor;
import java.util.*;
@@ -68,7 +65,7 @@ public class LensServices extends CompositeService implements ServiceProvider {
/** The instance. */
private static LensServices instance = new LensServices(LENS_SERVICES_NAME,
- new MappedDiagnosticLogSegregationContext());
+ new MappedDiagnosticLogSegregationContext());
/** The conf. */
private HiveConf conf;
@@ -450,7 +447,7 @@ public class LensServices extends CompositeService implements ServiceProvider {
private MetricsService getMetricService() {
if (metricsService == null) {
- metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ metricsService = LensServices.get().getService(MetricsService.NAME);
if (metricsService == null) {
throw new NullPointerException("Could not get metrics service");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
index e7ef804..35874ea 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
@@ -53,7 +53,7 @@ public class MetastoreResource {
public static final ObjectFactory X_CUBE_OBJECT_FACTORY = new ObjectFactory();
public CubeMetastoreService getSvc() {
- return (CubeMetastoreService) LensServices.get().getService("metastore");
+ return LensServices.get().getService(CubeMetastoreService.NAME);
}
private void checkSessionId(LensSessionHandle sessionHandle) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
index e430324..3389aba 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
@@ -238,7 +238,7 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
}
private QueryExecutionService getQuerySvc() {
- return (QueryExecutionService) LensServices.get().getService(QueryExecutionService.NAME);
+ return LensServices.get().getService(QueryExecutionService.NAME);
}
/** The time between polls. */
@@ -253,7 +253,7 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
public synchronized void init(HiveConf hiveConf) {
queryStatusListener = new AsyncQueryStatusListener();
sessionEventListener = new AsyncSessionEventListener();
- LensEventService eventService = (LensEventService) LensServices.get().getService(LensEventService.NAME);
+ LensEventService eventService = LensServices.get().getService(LensEventService.NAME);
eventService.addListenerForType(queryStatusListener, StatusChange.class);
eventService.addListenerForType(sessionEventListener, SessionEvent.class);
metricRegistry = LensMetricsRegistry.getStaticRegistry();
@@ -439,7 +439,7 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
@Override
public synchronized void stop() {
// unregister
- LensEventService eventService = (LensEventService) LensServices.get().getService(LensEventService.NAME);
+ LensEventService eventService = LensServices.get().getService(LensEventService.NAME);
if (eventService != null) {
eventService.removeListener(queryStatusListener);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
index e004318..45ba7ac 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryEndNotifier.java
@@ -220,7 +220,7 @@ public class QueryEndNotifier extends AsyncEventListener<QueryEnded> {
message.setContent(multipart);
Transport.send(message);
} catch (Exception e) {
- MetricsService metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricsService = LensServices.get().getService(MetricsService.NAME);
metricsService.incrCounter(QueryEndNotifier.class, EMAIL_ERROR_COUNTER);
log.error("Error sending query end email", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
index a7c0669..49fab8a 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
@@ -374,7 +374,7 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
private MetricsService getMetrics() {
if (metricsService == null) {
- metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ metricsService = LensServices.get().getService(MetricsService.NAME);
if (metricsService == null) {
throw new NullPointerException("Could not get metrics service");
}
@@ -384,7 +384,7 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
private StatisticsService getStatisticsService() {
if (statisticsService == null) {
- statisticsService = (StatisticsService) LensServices.get().getService(StatisticsService.STATS_SVC_NAME);
+ statisticsService = LensServices.get().getService(StatisticsService.STATS_SVC_NAME);
if (statisticsService == null) {
throw new NullPointerException("Could not get statistics service");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
index fce9cf5..d3c443a 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
@@ -124,7 +124,7 @@ public class QueryServiceResource {
* @throws LensException the lens exception
*/
public QueryServiceResource() throws LensException {
- queryServer = (QueryExecutionService) LensServices.get().getService("query");
+ queryServer = LensServices.get().getService(QueryExecutionService.NAME);
errorCollection = LensServices.get().getErrorCollection();
logSegregationContext = LensServices.get().getLogSegregationContext();
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/query/ResultFormatter.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/ResultFormatter.java b/lens-server/src/main/java/org/apache/lens/server/query/ResultFormatter.java
index 2295248..af42eb0 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/ResultFormatter.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/ResultFormatter.java
@@ -134,7 +134,7 @@ public class ResultFormatter extends AsyncEventListener<QueryExecuted> {
log.info("Result formatter has completed. Final path:{}", formatter.getFinalOutputPath());
}
} catch (Exception e) {
- MetricsService metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricsService = LensServices.get().getService(MetricsService.NAME);
metricsService.incrCounter(ResultFormatter.class, "formatting-errors");
log.warn("Exception while formatting result for {}", queryHandle, e);
try {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/session/DatabaseResourceService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/DatabaseResourceService.java b/lens-server/src/main/java/org/apache/lens/server/session/DatabaseResourceService.java
index 79ebe28..df7396c 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/DatabaseResourceService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/DatabaseResourceService.java
@@ -327,7 +327,7 @@ public class DatabaseResourceService extends AbstractService {
private MetricsService getMetrics() {
if (metricsService == null) {
- metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ metricsService = LensServices.get().getService(MetricsService.NAME);
if (metricsService == null) {
throw new NullPointerException("Could not get metrics service");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
index ab5be32..22497ca 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
@@ -37,6 +37,7 @@ import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.health.HealthStatus;
+import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.api.session.SessionClosed;
import org.apache.lens.server.api.session.SessionExpired;
import org.apache.lens.server.api.session.SessionOpened;
@@ -496,7 +497,7 @@ public class HiveSessionService extends BaseLensService implements SessionServic
private void closeInternal(LensSessionHandle sessionHandle) throws LensException {
super.closeSession(sessionHandle);
// Inform query service
- BaseLensService svc = LensServices.get().getService(QueryExecutionServiceImpl.NAME);
+ BaseLensService svc = LensServices.get().getService(QueryExecutionService.NAME);
if (svc instanceof QueryExecutionServiceImpl) {
((QueryExecutionServiceImpl) svc).closeDriverSessions(sessionHandle);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
index 63d7b9c..3ba5edd 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
@@ -69,7 +69,7 @@ public class SessionResource {
* @throws org.apache.lens.server.api.error.LensException the lens exception
*/
public SessionResource() throws LensException {
- sessionService = (SessionService) LensServices.get().getService("session");
+ sessionService = LensServices.get().getService(SessionService.NAME);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/stats/StatisticsService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/stats/StatisticsService.java b/lens-server/src/main/java/org/apache/lens/server/stats/StatisticsService.java
index a233998..0fd77c9 100644
--- a/lens-server/src/main/java/org/apache/lens/server/stats/StatisticsService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/stats/StatisticsService.java
@@ -21,6 +21,7 @@ package org.apache.lens.server.stats;
import org.apache.lens.server.EventServiceImpl;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.LensConfConstants;
+import org.apache.lens.server.api.events.LensEventService;
import org.apache.lens.server.stats.store.StatisticsStore;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -84,8 +85,7 @@ public class StatisticsService extends AbstractService {
@Override
public synchronized void start() {
if (store != null) {
- store.start((org.apache.lens.server.api.events.LensEventService) LensServices.get().getService(
- EventServiceImpl.NAME));
+ store.start(LensServices.get().<EventServiceImpl>getService(LensEventService.NAME));
} else {
LOG.warn("Unable to start the LogStore.");
}
@@ -101,8 +101,7 @@ public class StatisticsService extends AbstractService {
@Override
public synchronized void stop() {
if (store != null) {
- store.stop((org.apache.lens.server.api.events.LensEventService) LensServices.get().getService(
- EventServiceImpl.NAME));
+ store.stop(LensServices.get().<EventServiceImpl>getService(LensEventService.NAME));
} else {
LOG.warn("Not starting the LogStore as it was not started.");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/stats/store/log/LogStatisticsStore.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/LogStatisticsStore.java b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/LogStatisticsStore.java
index 81ad260..e7e6025 100644
--- a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/LogStatisticsStore.java
+++ b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/LogStatisticsStore.java
@@ -100,7 +100,7 @@ public class LogStatisticsStore extends StatisticsStore<LoggableLensStatistics>
LoggerFactory.getLogger(eventClass).info(representation);
}
} catch (Exception exc) {
- MetricsService metricsService = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricsService = LensServices.get().getService(MetricsService.NAME);
metricsService.incrCounter(LogStatisticsStore.class, LOG_STORE_ERRORS);
LOG.error("Unknown error ", exc);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogFileScannerTask.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogFileScannerTask.java b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogFileScannerTask.java
index 4144416..7c9ff9e 100644
--- a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogFileScannerTask.java
+++ b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogFileScannerTask.java
@@ -89,7 +89,7 @@ public class StatisticsLogFileScannerTask extends TimerTask {
}
}
} catch (Exception exc) {
- MetricsService svc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService svc = LensServices.get().getService(MetricsService.NAME);
svc.incrCounter(StatisticsLogFileScannerTask.class, LOG_SCANNER_ERRORS);
log.error("Unknown error in log file scanner ", exc);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogPartitionHandler.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogPartitionHandler.java b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogPartitionHandler.java
index 3f4d04a..6d92ab9 100644
--- a/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogPartitionHandler.java
+++ b/lens-server/src/main/java/org/apache/lens/server/stats/store/log/StatisticsLogPartitionHandler.java
@@ -104,7 +104,7 @@ public class StatisticsLogPartitionHandler extends AsyncEventListener<PartitionE
new File(entry.getValue()).delete();
}
} catch (Exception e) {
- MetricsService svc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService svc = LensServices.get().getService(MetricsService.NAME);
svc.incrCounter(StatisticsLogPartitionHandler.class, LOG_PARTITION_HANDLER_COUNTER);
LOG.error("Unable to copy file to the file system", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
index da3bfd1..faaf172 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
@@ -47,7 +47,7 @@ import lombok.extern.slf4j.Slf4j;
public class MetastoreUIResource {
public CubeMetastoreService getSvc() {
- return (CubeMetastoreService) LensServices.get().getService("metastore");
+ return LensServices.get().getService(CubeMetastoreService.NAME);
}
private void checkSessionHandle(LensSessionHandle sessionHandle) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
index ed2552c..17022aa 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
@@ -81,7 +81,7 @@ public class QueryServiceUIResource {
*/
public QueryServiceUIResource() {
log.info("Query UI Service");
- queryServer = (QueryExecutionService) LensServices.get().getService("query");
+ queryServer = LensServices.get().getService(QueryExecutionService.NAME);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
index 01db262..f38e70d 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
@@ -79,7 +79,7 @@ public class SessionUIResource {
* @throws LensException the lens exception
*/
public SessionUIResource() throws LensException {
- sessionService = (SessionService) LensServices.get().getService("session");
+ sessionService = LensServices.get().getService(SessionService.NAME);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
index 2beb3b9..05bd99f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
@@ -155,7 +155,7 @@ public abstract class LensJerseyTest extends JerseyTest {
protected void verifyMetrics() {
// print final metrics
System.out.println("Final report");
- MetricsService metrics = ((MetricsService) LensServices.get().getService(MetricsService.NAME));
+ MetricsService metrics = LensServices.get().getService(MetricsService.NAME);
metrics.publishReport();
// validate http error count
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java b/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
index 4c8a583..4f9f4d2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestLensApplication.java
@@ -89,7 +89,7 @@ public class TestLensApplication extends LensJerseyTest {
@Test
public void testMetricService() {
- MetricsService metrics = ((MetricsService) LensServices.get().getService(MetricsService.NAME));
+ MetricsService metrics = LensServices.get().getService(MetricsService.NAME);
List<ScheduledReporter> reporters = ((MetricsServiceImpl) metrics).getReporters();
assertEquals(reporters.size(), 1, "mismatch in the number of reporters");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
index 4a88055..49d62f9 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
@@ -37,6 +37,7 @@ import org.apache.lens.api.query.*;
import org.apache.lens.api.result.LensAPIResult;
import org.apache.lens.driver.hive.TestRemoteHiveDriver;
import org.apache.lens.server.api.error.LensException;
+import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.api.session.SessionService;
import org.apache.lens.server.common.TestResourceFile;
import org.apache.lens.server.query.QueryExecutionServiceImpl;
@@ -126,7 +127,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
public void testQueryService() throws InterruptedException, IOException, LensException {
log.info("Server restart test");
- QueryExecutionServiceImpl queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ QueryExecutionServiceImpl queryService = LensServices.get().getService(QueryExecutionService.NAME);
Assert.assertTrue(queryService.getHealthStatus().isHealthy());
LensSessionHandle lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
@@ -181,7 +182,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
log.info("Restarting lens server!");
restartLensServer();
log.info("Restarted lens server!");
- queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ queryService = LensServices.get().getService(QueryExecutionService.NAME);
Assert.assertTrue(queryService.getHealthStatus().isHealthy());
// All queries should complete after server restart
@@ -221,7 +222,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
*/
@Test
public void testHiveServerRestart() throws Exception {
- QueryExecutionServiceImpl queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ QueryExecutionServiceImpl queryService = LensServices.get().getService(QueryExecutionService.NAME);
Assert.assertTrue(queryService.getHealthStatus().isHealthy());
LensSessionHandle lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
@@ -233,7 +234,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
createRestartTestDataFile();
// Add a resource to check if its added after server restart.
- HiveSessionService sessionService = (HiveSessionService) LensServices.get().getService(SessionService.NAME);
+ HiveSessionService sessionService = LensServices.get().getService(SessionService.NAME);
Assert.assertTrue(sessionService.getHealthStatus().isHealthy());
sessionService.addResource(lensSessionId, "FILE", dataFile.toURI().toString());
@@ -399,7 +400,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
// Check resources added again
verifyParamOnRestart(restartTestSession);
- HiveSessionService sessionService = LensServices.get().getService("session");
+ HiveSessionService sessionService = LensServices.get().getService(SessionService.NAME);
Assert.assertTrue(sessionService.getHealthStatus().isHealthy());
LensSessionImpl session = sessionService.getSession(restartTestSession);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/TestServiceProvider.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServiceProvider.java b/lens-server/src/test/java/org/apache/lens/server/TestServiceProvider.java
index af14fd6..c1d0f38 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServiceProvider.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServiceProvider.java
@@ -52,10 +52,10 @@ public class TestServiceProvider extends LensAllApplicationJerseyTest {
Assert.assertNotNull(serviceProvider);
Assert.assertTrue(serviceProvider instanceof LensServices);
- QueryExecutionService querySvc = (QueryExecutionService) serviceProvider.getService(QueryExecutionService.NAME);
+ QueryExecutionService querySvc = serviceProvider.getService(QueryExecutionService.NAME);
Assert.assertNotNull(querySvc);
- LensEventService eventSvc = (LensEventService) serviceProvider.getService(LensEventService.NAME);
+ LensEventService eventSvc = serviceProvider.getService(LensEventService.NAME);
Assert.assertNotNull(eventSvc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
index 5edbd13..924187f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
@@ -42,6 +42,7 @@ import org.apache.lens.cube.metadata.ExprColumn.ExprSpec;
import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.LensTestUtil;
+import org.apache.lens.server.api.metastore.CubeMetastoreService;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -73,7 +74,7 @@ public class TestMetastoreService extends LensJerseyTest {
public void setUp() throws Exception {
super.setUp();
cubeObjectFactory = new ObjectFactory();
- metastoreService = (CubeMetastoreServiceImpl) LensServices.get().getService("metastore");
+ metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
index 1747d03..94e8069 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
@@ -43,6 +43,7 @@ import org.apache.lens.server.LensAllApplicationJerseyTest;
import org.apache.lens.server.LensApplication;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.LensTestUtil;
+import org.apache.lens.server.api.metastore.CubeMetastoreService;
import org.apache.lens.server.api.metrics.MethodMetrics;
import org.apache.lens.server.api.metrics.MetricsService;
import org.apache.lens.server.common.TestResourceFile;
@@ -78,8 +79,8 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- metricsSvc = (MetricsServiceImpl) LensServices.get().getService(MetricsService.NAME);
- metastoreService = (CubeMetastoreServiceImpl) LensServices.get().getService(CubeMetastoreServiceImpl.NAME);
+ metricsSvc = LensServices.get().getService(MetricsService.NAME);
+ metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
methodMetricsMap = metricsSvc.getMethodMetricsFactory().getMethodMetricsMap();
//reset
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java b/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
index bdd49f5..708afe5 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
@@ -37,6 +37,7 @@ import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.query.FinishedLensQuery;
import org.apache.lens.server.api.query.QueryContext;
+import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.hadoop.conf.Configuration;
@@ -60,7 +61,7 @@ public class TestLensDAO extends LensJerseyTest {
*/
@Test
public void testLensServerDAO() throws Exception {
- QueryExecutionServiceImpl service = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ QueryExecutionServiceImpl service = LensServices.get().getService(QueryExecutionService.NAME);
// Test insert query
QueryContext queryContext = service.createContext("SELECT ID FROM testTable", "foo@localhost", new LensConf(),
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
index deb7642..82ce205 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
@@ -46,6 +46,7 @@ import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
+import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.common.TestResourceFile;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -91,7 +92,7 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
wiser = new Wiser();
wiser.setHostname("localhost");
wiser.setPort(25000);
- queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ queryService = LensServices.get().getService(QueryExecutionService.NAME);
Map<String, String> sessionconf = new HashMap<String, String>();
sessionconf.put("test.session.key", "svalue");
sessionconf.put(LensConfConstants.QUERY_MAIL_NOTIFY, "true");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index 84b315c..29dede8 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -54,6 +54,7 @@ import org.apache.lens.server.api.metrics.LensMetricsRegistry;
import org.apache.lens.server.api.metrics.MetricsService;
import org.apache.lens.server.api.query.AbstractQueryContext;
import org.apache.lens.server.api.query.QueryContext;
+import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.api.session.SessionService;
import org.apache.lens.server.common.ErrorResponseExpectedData;
import org.apache.lens.server.common.TestDataUtils;
@@ -118,8 +119,8 @@ public class TestQueryService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
- metricsSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ queryService = LensServices.get().getService(QueryExecutionService.NAME);
+ metricsSvc = LensServices.get().getService(MetricsService.NAME);
Map<String, String> sessionconf = new HashMap<String, String>();
sessionconf.put("test.session.key", "svalue");
lensSessionId = queryService.openSession("foo@localhost", "bar", sessionconf); // @localhost should be removed
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
index c17b28b..46a01f8 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
@@ -40,9 +40,7 @@ import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
-import org.apache.lens.server.api.query.InMemoryOutputFormatter;
-import org.apache.lens.server.api.query.PersistedOutputFormatter;
-import org.apache.lens.server.api.query.QueryContext;
+import org.apache.lens.server.api.query.*;
import org.apache.lens.server.common.TestResourceFile;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
@@ -80,7 +78,7 @@ public class TestResultFormatting extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
+ queryService = LensServices.get().getService(QueryExecutionService.NAME);
lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
LensTestUtil.createTable(testTable, target(), lensSessionId,
"(ID INT, IDSTR STRING, IDARR ARRAY<INT>, IDSTRARR ARRAY<STRING>)");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/session/TestSessionExpiry.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionExpiry.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionExpiry.java
index 52402a0..dbdaaec 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionExpiry.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionExpiry.java
@@ -57,7 +57,7 @@ public class TestSessionExpiry {
HiveSessionService lensService = new HiveSessionService(cliService);
lensService.init(conf);
lensService.start();
- MetricsService metricSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricSvc = LensServices.get().getService(MetricsService.NAME);
try {
LensSessionHandle sessionHandle = lensService.openSession("foo", "bar", new HashMap<String, String>());
@@ -96,7 +96,7 @@ public class TestSessionExpiry {
HiveSessionService lensService = new HiveSessionService(cliService);
lensService.init(conf);
lensService.start();
- MetricsService metricSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ MetricsService metricSvc = LensServices.get().getService(MetricsService.NAME);
try {
LensSessionHandle sessionHandle = lensService.openSession("foo", "bar", new HashMap<String, String>());
LensSessionImpl session = lensService.getSession(sessionHandle);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f9b0b356/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
index 5f2cbfd..8fffbc9 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
@@ -80,7 +80,7 @@ public class TestSessionResource extends LensJerseyTest {
*/
@BeforeTest
public void setUp() throws Exception {
- metricsSvc = (MetricsService) LensServices.get().getService(MetricsService.NAME);
+ metricsSvc = LensServices.get().getService(MetricsService.NAME);
super.setUp();
}
@@ -301,7 +301,7 @@ public class TestSessionResource extends LensJerseyTest {
Assert.assertNotNull(handle);
// verify aux jars are loaded
- HiveSessionService service = (HiveSessionService) LensServices.get().getService(SessionService.NAME);
+ HiveSessionService service = LensServices.get().getService(SessionService.NAME);
ClassLoader loader = service.getSession(handle).getSessionState().getConf().getClassLoader();
boolean found = false;
for (URL path : ((URLClassLoader) loader).getURLs()) {