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:29 UTC
[06/50] [abbrv] incubator-lens git commit: LENS-668 : Use Slf4j in
lens-server module
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 71d29b4..da3bfd1 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
@@ -30,13 +30,12 @@ import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.metastore.CubeMetastoreService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
/**
* metastore UI resource api
* <p></p>
@@ -44,10 +43,9 @@ import org.json.JSONObject;
*/
@Path("metastoreapi")
+@Slf4j
public class MetastoreUIResource {
- public static final Log LOG = LogFactory.getLog(MetastoreUIResource.class);
-
public CubeMetastoreService getSvc() {
return (CubeMetastoreService) LensServices.get().getService("metastore");
}
@@ -96,7 +94,7 @@ public class MetastoreUIResource {
try {
tableList.put(new JSONObject().put("name", cube).put("type", "cube"));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -113,7 +111,7 @@ public class MetastoreUIResource {
try {
tableList.put(new JSONObject().put("name", dimTable).put("type", "dimtable"));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -124,7 +122,7 @@ public class MetastoreUIResource {
tableList.put(new JSONObject().put("name", nativeTable).put("type", "native"));
}
} catch (Exception e) {
- LOG.error(e);
+ log.error("Error while getting all native tables", e);
}
return tableList.toString();
@@ -160,7 +158,7 @@ public class MetastoreUIResource {
try {
attribList.put(new JSONObject().put("name", measure.getName()).put("type", measure.getType()));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -169,7 +167,7 @@ public class MetastoreUIResource {
try {
attribList.put(new JSONObject().put("name", dim.getName()).put("type", dim.getType()));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -185,7 +183,7 @@ public class MetastoreUIResource {
try {
attribList.put(new JSONObject().put("name", col.getName()).put("type", col.getType()));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -196,7 +194,7 @@ public class MetastoreUIResource {
attribList.put(new JSONObject().put("name", expr.getName()).put("type", "expression")
.put("expression", expr.getExprSpec()));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -223,7 +221,7 @@ public class MetastoreUIResource {
tableList = new JSONArray(getAllTables(publicId));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
for (int item = 0; item < tableList.length(); item++) {
String name = null, type = null;
@@ -231,7 +229,7 @@ public class MetastoreUIResource {
name = tableList.getJSONObject(item).getString("name");
type = tableList.getJSONObject(item).getString("type");
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
if (type.equals("cube")) {
JSONArray cubeAttribList = null;
@@ -240,7 +238,7 @@ public class MetastoreUIResource {
cubeAttribList = new JSONArray(getDescription(publicId, "cube", name));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
for (int col = 0; col < cubeAttribList.length(); col++) {
String colname = null, coltype = null;
@@ -249,13 +247,13 @@ public class MetastoreUIResource {
coltype = cubeAttribList.getJSONObject(col).getString("type");
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
if (colname.contains(keyword)) {
try {
cubeSearchResultList.put(new JSONObject().put("name", colname).put("type", coltype));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -264,14 +262,14 @@ public class MetastoreUIResource {
searchResultList.put(new JSONObject().put("name", name).put("type", type).put("columns",
cubeSearchResultList));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
} else if (name.contains(keyword)) {
try {
searchResultList.put(new JSONObject().put("name", name).put("type", type).put("columns",
cubeSearchResultList));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
} else if (type.equals("dimtable")) {
@@ -281,7 +279,7 @@ public class MetastoreUIResource {
dimAttribList = new JSONArray(getDescription(publicId, "dimtable", name));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
for (int col = 0; col < dimAttribList.length(); col++) {
String colname = null, coltype = null;
@@ -290,13 +288,13 @@ public class MetastoreUIResource {
coltype = dimAttribList.getJSONObject(col).getString("type");
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
if (colname.contains(keyword)) {
try {
dimSearchResultList.put(new JSONObject().put("name", colname).put("type", coltype));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
@@ -305,14 +303,14 @@ public class MetastoreUIResource {
searchResultList.put(new JSONObject().put("name", name).put("type", type).put("columns",
dimSearchResultList));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
} else if (name.contains(keyword)) {
try {
searchResultList.put(new JSONObject().put("name", name).put("type", type).put("columns",
dimSearchResultList));
} catch (JSONException j) {
- LOG.error(j);
+ log.error("Error while parsing json", j);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 391cf08..ed2552c 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
@@ -35,20 +35,18 @@ import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class QueryServiceUIResource.
*/
@Path("/queryuiapi")
+@Slf4j
public class QueryServiceUIResource {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(QueryServiceUIResource.class);
-
/** The query server. */
private QueryExecutionService queryServer;
@@ -82,7 +80,7 @@ public class QueryServiceUIResource {
* Instantiates a new query service ui resource.
*/
public QueryServiceUIResource() {
- LOG.info("Query UI Service");
+ log.info("Query UI Service");
queryServer = (QueryExecutionService) LensServices.get().getService("query");
}
@@ -194,7 +192,7 @@ public class QueryServiceUIResource {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
checkSessionHandle(sessionHandle);
List<Object> rows = new ArrayList<Object>();
- LOG.info("FetchResultSet for queryHandle:" + queryHandle);
+ log.info("FetchResultSet for queryHandle:{}", queryHandle);
try {
QueryResultSetMetadata resultSetMetadata = queryServer.getResultSetMetadata(sessionHandle,
getQueryHandle(queryHandle));
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 cd1ba36..01db262 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
@@ -33,22 +33,19 @@ import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.session.SessionService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.glassfish.jersey.media.multipart.FormDataParam;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Session resource api
* <p></p>
* This provides api for all things in session.
*/
@Path("/uisession")
+@Slf4j
public class SessionUIResource {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(SessionUIResource.class);
-
/** The open sessions. */
private static HashMap<UUID, LensSessionHandle> openSessions
= new HashMap<UUID, LensSessionHandle>();
@@ -137,7 +134,7 @@ public class SessionUIResource {
@Path("{publicId}")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
public APIResult closeSession(@PathParam("publicId") UUID publicId) {
- LOG.info("Closing session with id: " + publicId);
+ log.info("Closing session with id: {}", publicId);
LensSessionHandle sessionHandle = getOpenSession(publicId);
checkSessionHandle(sessionHandle);
openSessions.remove(publicId);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/main/java/org/apache/lens/server/ui/StaticFileResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/StaticFileResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/StaticFileResource.java
index 8563951..7e07589 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/StaticFileResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/StaticFileResource.java
@@ -31,8 +31,6 @@ import javax.ws.rs.core.Response;
import org.apache.lens.server.LensServices;
import org.apache.lens.server.api.LensConfConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import com.google.common.cache.CacheBuilder;
@@ -46,9 +44,6 @@ import com.google.common.io.Files;
@Path("/")
public class StaticFileResource {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(StaticFileResource.class);
-
// Cache for file content, bound by both size and time
/** The Constant CONTENT_CACHE. */
private static final LoadingCache<String, String> CONTENT_CACHE = CacheBuilder.newBuilder().maximumSize(100)
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 44aa0aa..2beb3b9 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
@@ -33,8 +33,6 @@ import org.apache.lens.server.api.metrics.MetricsService;
import org.apache.lens.server.model.LogSegregationContext;
import org.apache.lens.server.model.MappedDiagnosticLogSegregationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hive.service.Service;
import org.apache.hive.service.Service.STATE;
@@ -43,13 +41,14 @@ import org.glassfish.jersey.test.JerseyTest;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Extend this class for unit testing Lens Jersey resources
*/
+@Slf4j
public abstract class LensJerseyTest extends JerseyTest {
- public static final Log LOG = LogFactory.getLog(LensJerseyTest.class);
-
private int port = -1;
private final LogSegregationContext logSegregationContext = new MappedDiagnosticLogSegregationContext();
@@ -63,11 +62,11 @@ public abstract class LensJerseyTest extends JerseyTest {
}
public void setUp() throws Exception {
- LOG.info("setUp in class: " + this.getClass().getCanonicalName());
+ log.info("setUp in class: {}", this.getClass().getCanonicalName());
super.setUp();
}
public void tearDown() throws Exception {
- LOG.info("tearDown in class: " + this.getClass().getCanonicalName());
+ log.info("tearDown in class: {}", this.getClass().getCanonicalName());
super.tearDown();
}
protected int getTestPort() {
@@ -79,14 +78,14 @@ public abstract class LensJerseyTest extends JerseyTest {
socket = new ServerSocket(0);
setPort(socket.getLocalPort());
} catch (IOException e) {
- LOG.info("Exception occured while creating socket. Use a default port number " + port);
+ log.info("Exception occured while creating socket. Use a default port number {}", port);
} finally {
try {
if (socket != null) {
socket.close();
}
} catch (IOException e) {
- LOG.info("Exception occured while closing the socket ", e);
+ log.info("Exception occured while closing the socket", e);
}
}
return port;
@@ -112,7 +111,7 @@ public abstract class LensJerseyTest extends JerseyTest {
*/
@BeforeSuite
public void startAll() throws Exception {
- LOG.info("Before suite");
+ log.info("Before suite");
System.setProperty("lens.log.dir", "target/");
TestRemoteHiveDriver.createHS2Service();
System.out.println("Remote hive server started!");
@@ -142,7 +141,7 @@ public abstract class LensJerseyTest extends JerseyTest {
*/
@AfterSuite
public void stopAll() throws Exception {
- LOG.info("After suite");
+ log.info("After suite");
verifyMetrics();
LensServices.get().stop();
System.out.println("Lens services stopped!");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/TestResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestResource.java b/lens-server/src/test/java/org/apache/lens/server/TestResource.java
index da07a6c..bfc360b 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestResource.java
@@ -23,18 +23,12 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* The Class TestResource.
*/
@Path("/test")
public class TestResource {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TestResource.class);
-
/**
* API to check if resource is up and running
*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 a84fcd3..697e867 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
@@ -39,8 +39,6 @@ import org.apache.lens.server.query.TestQueryService;
import org.apache.lens.server.session.HiveSessionService;
import org.apache.lens.server.session.LensSessionImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hive.service.Service;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
@@ -51,15 +49,15 @@ import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class TestServerRestart.
*/
@Test(alwaysRun = true, groups = "restart-test", dependsOnGroups = "unit-test")
+@Slf4j
public class TestServerRestart extends LensAllApplicationJerseyTest {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TestServerRestart.class);
-
/** The data file. */
private File dataFile;
@@ -120,7 +118,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
*/
@Test
public void testQueryService() throws InterruptedException, IOException, LensException {
- LOG.info("Server restart test");
+ log.info("Server restart test");
QueryExecutionServiceImpl queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
LensSessionHandle lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
@@ -130,7 +128,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
// Create a test table
LensTestUtil.createTable("test_server_restart", target(), lensSessionId);
LensTestUtil.loadData("test_server_restart", TestResourceFile.TEST_DATA_FILE.getValue(), target(), lensSessionId);
- LOG.info("Loaded data");
+ log.info("Loaded data");
// test post execute op
final WebTarget target = target().path("queryapi/queries");
@@ -144,9 +142,9 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
// Kill the query submitter thread to make sure some queries stay in accepted queue
try {
queryService.pauseQuerySubmitter();
- LOG.info("Stopped query submitter");
+ log.info("Stopped query submitter");
} catch (Exception exc) {
- LOG.error("Could not kill query submitter", exc);
+ log.error("Could not kill query submitter", exc);
}
killed = true;
}
@@ -166,25 +164,25 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- LOG.info(i + " submitted query " + handle + " state: " + ctx.getStatus().getStatus());
+ log.info("{} submitted query {} state: {}", i, handle, ctx.getStatus().getStatus());
launchedQueries.add(handle);
}
// Restart the server
- LOG.info("Restarting lens server!");
+ log.info("Restarting lens server!");
restartLensServer();
- LOG.info("Restarted lens server!");
+ log.info("Restarted lens server!");
queryService = (QueryExecutionServiceImpl) LensServices.get().getService("query");
// All queries should complete after server restart
for (QueryHandle handle : launchedQueries) {
- LOG.info("Polling query " + handle);
+ log.info("Polling query {}", handle);
try {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
while (!stat.finished()) {
- LOG.info("Polling query " + handle + " Status:" + stat);
+ log.info("Polling query {} Status:{}", handle, stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -196,13 +194,13 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
List<String> rows = TestQueryService.readResultSet(resultset, handle, true);
Assert.assertEquals(rows.size(), 1);
Assert.assertEquals(rows.get(0), "" + NROWS);
- LOG.info("Completed " + handle);
+ log.info("Completed {}", handle);
} catch (Exception exc) {
- LOG.error("Failed query " + handle, exc);
+ log.error("Failed query {}", handle, exc);
Assert.fail(exc.getMessage());
}
}
- LOG.info("End server restart test");
+ log.info("End server restart test");
LensTestUtil.dropTable("test_server_restart", target(), lensSessionId);
queryService.closeSession(lensSessionId);
}
@@ -227,15 +225,15 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
HiveSessionService sessionService = (HiveSessionService) LensServices.get().getService(SessionService.NAME);
sessionService.addResource(lensSessionId, "FILE", dataFile.toURI().toString());
queryService.getSession(lensSessionId).addResource("FILE", dataFile.toURI().toString());
- LOG.info("@@ Added resource " + dataFile.toURI());
+ log.info("@@ Added resource {}", dataFile.toURI());
// Create a test table
LensTestUtil.createTable("test_hive_server_restart", target(), lensSessionId);
LensTestUtil.loadData("test_hive_server_restart", TestResourceFile.TEST_DATA_FILE.getValue(), target(),
lensSessionId);
- LOG.info("Loaded data");
+ log.info("Loaded data");
- LOG.info("Hive Server restart test");
+ log.info("Hive Server restart test");
// test post execute op
final WebTarget target = target().path("queryapi/queries");
@@ -260,24 +258,24 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
for (int i = 0; i < sessionResources.size(); i++) {
restoreCounts[i] = sessionResources.get(i).getRestoreCount();
}
- LOG.info("@@ Current counts " + Arrays.toString(restoreCounts));
+ log.info("@@ Current counts {}", Arrays.toString(restoreCounts));
// Restart hive server
TestRemoteHiveDriver.stopHS2Service();
// Wait for server to stop
while (TestRemoteHiveDriver.getServerState() != Service.STATE.STOPPED) {
- LOG.info("Waiting for HS2 to stop. Current state " + TestRemoteHiveDriver.getServerState());
+ log.info("Waiting for HS2 to stop. Current state {}", TestRemoteHiveDriver.getServerState());
Thread.sleep(1000);
}
TestRemoteHiveDriver.createHS2Service();
// Wait for server to come up
while (Service.STATE.STARTED != TestRemoteHiveDriver.getServerState()) {
- LOG.info("Waiting for HS2 to start " + TestRemoteHiveDriver.getServerState());
+ log.info("Waiting for HS2 to start {}", TestRemoteHiveDriver.getServerState());
Thread.sleep(1000);
}
Thread.sleep(10000);
- LOG.info("Server restarted");
+ log.info("Server restarted");
// Check params to be set
verifyParamOnRestart(lensSessionId);
@@ -288,14 +286,14 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
while (!stat.finished()) {
- LOG.info("Polling query " + handle + " Status:" + stat);
+ log.info("Polling query {} Status:{}", handle, stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
}
Assert.assertTrue(stat.finished());
- LOG.info("Previous query status: " + stat.getStatusMessage());
+ log.info("Previous query status: {}", stat.getStatusMessage());
for (int i = 0; i < 5; i++) {
// Submit another query, again no exception expected
@@ -315,12 +313,12 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
while (!stat.finished()) {
- LOG.info("Post restart polling query " + handle + " Status:" + stat);
+ log.info("Post restart polling query {} Status:{}", handle, stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
}
- LOG.info("@@ " + i + " Final status for " + handle + " " + stat.getStatus());
+ log.info("@@ {} Final status for {}: {}", i, handle, stat.getStatus());
}
// Now we can expect that session resources have been added back exactly once
@@ -328,12 +326,12 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
LensSessionImpl.ResourceEntry resourceEntry = sessionResources.get(i);
Assert.assertEquals(resourceEntry.getRestoreCount(), 1 + restoreCounts[i], "Restore test failed for "
+ resourceEntry + " pre count=" + restoreCounts[i] + " post count=" + resourceEntry.getRestoreCount());
- LOG.info("@@ Latest count " + resourceEntry + " = " + resourceEntry.getRestoreCount());
+ log.info("@@ Latest count {}={}", resourceEntry, resourceEntry.getRestoreCount());
}
// Assert.assertEquals(stat.getStatus(), QueryStatus.Status.SUCCESSFUL,
// "Expected to be successful " + handle);
- LOG.info("End hive server restart test");
+ log.info("End hive server restart test");
LensTestUtil.dropTable("test_hive_server_restart", target(), lensSessionId);
queryService.closeSession(lensSessionId);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/TestStartupOnMetastoreDown.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestStartupOnMetastoreDown.java b/lens-server/src/test/java/org/apache/lens/server/TestStartupOnMetastoreDown.java
index 3fb123e..8d3ee60 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestStartupOnMetastoreDown.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestStartupOnMetastoreDown.java
@@ -21,16 +21,15 @@ package org.apache.lens.server;
import org.apache.lens.server.model.LogSegregationContext;
import org.apache.lens.server.model.MappedDiagnosticLogSegregationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.testng.Assert;
-public class TestStartupOnMetastoreDown {
- private static final Log LOG = LogFactory.getLog(TestStartupOnMetastoreDown.class);
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
+public class TestStartupOnMetastoreDown {
private final LogSegregationContext logSegregationContext = new MappedDiagnosticLogSegregationContext();
// @Test
@@ -51,7 +50,7 @@ public class TestStartupOnMetastoreDown {
try {
services.stop();
} catch (Exception exc) {
- LOG.error("Error stopping services", exc);
+ log.error("Error stopping services", exc);
Assert.fail("services.stop() got unexpected exception " + exc);
}
Hive.closeCurrent();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/TestStaticFileResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestStaticFileResource.java b/lens-server/src/test/java/org/apache/lens/server/TestStaticFileResource.java
index cf3b579..f8c5bf2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestStaticFileResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestStaticFileResource.java
@@ -30,9 +30,6 @@ import javax.ws.rs.core.UriBuilder;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.ui.UIApp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.glassfish.jersey.filter.LoggingFilter;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
@@ -44,8 +41,6 @@ import org.testng.annotations.Test;
@Test(groups = "unit-test")
public class TestStaticFileResource extends LensJerseyTest {
- public static final Log LOG = LogFactory.getLog(TestStaticFileResource.class);
-
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 4eb52b9..22dfd55 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
@@ -49,7 +49,6 @@ import org.apache.hadoop.hive.metastore.TableType;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
-import org.apache.log4j.BasicConfigurator;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.media.multipart.*;
@@ -73,7 +72,6 @@ public class TestMetastoreService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- BasicConfigurator.configure();
cubeObjectFactory = new ObjectFactory();
metastoreService = (CubeMetastoreServiceImpl) LensServices.get().getService("metastore");
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 118970d..1747d03 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
@@ -49,8 +49,6 @@ import org.apache.lens.server.common.TestResourceFile;
import org.apache.lens.server.metastore.CubeMetastoreServiceImpl;
import org.apache.lens.server.query.TestQueryService;
-import org.apache.log4j.BasicConfigurator;
-
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
@@ -61,7 +59,10 @@ import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
@Test(groups = "unit-test")
+@Slf4j
public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
private CubeMetastoreServiceImpl metastoreService;
private MetricsServiceImpl metricsSvc;
@@ -77,7 +78,6 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- BasicConfigurator.configure();
metricsSvc = (MetricsServiceImpl) LensServices.get().getService(MetricsService.NAME);
metastoreService = (CubeMetastoreServiceImpl) LensServices.get().getService(CubeMetastoreServiceImpl.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
@@ -123,16 +123,16 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
disableResourceMethodMetering();
metricsSvc.setEnableResourceMethodMetering(true);
Assert.assertEquals(methodMetricsMap.size(), 0);
- LOG.info("database operations");
+ log.info("database operations");
databaseOperations();
Assert.assertEquals(methodMetricsMap.size(), 3);
- LOG.info("create table");
+ log.info("create table");
createTable(TestQueryService.TEST_TABLE);
Assert.assertEquals(methodMetricsMap.size(), 5);
- LOG.info("load data");
+ log.info("load data");
loadData(TestQueryService.TEST_TABLE, TestResourceFile.TEST_DATA2_FILE.getValue());
Assert.assertEquals(methodMetricsMap.size(), 5);
- LOG.info("execute async");
+ log.info("execute async");
executeAsync();
verifyValues();
makeClientError();
@@ -149,7 +149,7 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
fail("Should get 404");
} catch (NotAllowedException e) {
// expected
- LOG.error(e);
+ log.error("Not found excepiton:", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
index a77378b..b8012be 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
@@ -43,20 +43,18 @@ import org.apache.lens.server.api.session.SessionRestored;
import org.apache.lens.server.query.QueryExecutionServiceImpl.QueryStatusLogger;
import org.apache.lens.server.stats.event.query.QueryExecutionStatistics;
-import org.apache.log4j.Logger;
-
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class TestEventService.
*/
@Test(groups = "unit-test")
+@Slf4j
public class TestEventService {
- /** The Constant LOG. */
- public static final Logger LOG = Logger.getLogger(TestEventService.class);
-
/** The service. */
EventServiceImpl service;
@@ -110,7 +108,7 @@ public class TestEventService {
public void process(LensEvent event) {
processed = true;
latch.countDown();
- LOG.info("LensEvent:" + event.getEventId());
+ log.info("LensEvent: {}", event.getEventId());
}
}
@@ -137,7 +135,7 @@ public class TestEventService {
public void onEvent(QueryFailed change) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Query Failed event: " + change);
+ log.info("Query Failed event: {}", change);
}
}
@@ -164,7 +162,7 @@ public class TestEventService {
public void onEvent(QueryEnded change) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Query ended event: " + change);
+ log.info("Query ended event: {}", change);
}
}
@@ -185,7 +183,7 @@ public class TestEventService {
public void onEvent(QueuePositionChange change) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Query position changed: " + change);
+ log.info("Query position changed: {}", change);
}
}
@@ -206,7 +204,7 @@ public class TestEventService {
public void onEvent(SessionOpened event) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Session opened: " + event);
+ log.info("Session opened: {}", event);
}
}
@@ -227,7 +225,7 @@ public class TestEventService {
public void onEvent(SessionClosed event) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Session closed: " + event);
+ log.info("Session closed: {}", event);
}
}
@@ -248,7 +246,7 @@ public class TestEventService {
public void onEvent(SessionExpired event) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Session expired: " + event);
+ log.info("Session expired: {}", event);
}
}
@@ -269,7 +267,7 @@ public class TestEventService {
public void onEvent(SessionRestored event) throws LensException {
processed = true;
latch.countDown();
- LOG.info("Session restored: " + event);
+ log.info("Session restored: {}", event);
}
}
@@ -284,7 +282,7 @@ public class TestEventService {
LensServices.get().start();
service = LensServices.get().getService(LensEventService.NAME);
assertNotNull(service);
- LOG.info("Service started " + service);
+ log.info("Service started {}", service);
}
/**
@@ -369,9 +367,9 @@ public class TestEventService {
try {
latch = new CountDownLatch(3);
- LOG.info("Sending session opened event: " + sessionOpenedEvent);
+ log.info("Sending session opened event: {}", sessionOpenedEvent);
service.notifyEvent(sessionOpenedEvent);
- LOG.info("Sending session restored event: " + sessionRestored);
+ log.info("Sending session restored event: {}", sessionRestored);
service.notifyEvent(sessionRestored);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
@@ -387,16 +385,16 @@ public class TestEventService {
};
latch = new CountDownLatch(2);
- LOG.info("Sending generic event " + genEvent.getEventId());
+ log.info("Sending generic event {}", genEvent.getEventId());
service.notifyEvent(genEvent);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
resetSessionListeners();
latch = new CountDownLatch(3);
- LOG.info("Sending session closed event " + sessionClosedEvent);
+ log.info("Sending session closed event {}", sessionClosedEvent);
service.notifyEvent(sessionClosedEvent);
- LOG.info("Sending session expired event " + sessionExpired);
+ log.info("Sending session expired event {}", sessionExpired);
service.notifyEvent(sessionExpired);
latch.await(5, TimeUnit.SECONDS);
assertTrue(sessionClosedListener.processed);
@@ -425,7 +423,7 @@ public class TestEventService {
try {
latch = new CountDownLatch(3);
- LOG.info("Sending event: " + failed);
+ log.info("Sending event: {}", failed);
service.notifyEvent(failed);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
@@ -435,7 +433,7 @@ public class TestEventService {
resetListeners();
latch = new CountDownLatch(2);
- LOG.info("Sending event : " + success);
+ log.info("Sending event : {}", success);
service.notifyEvent(success);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
@@ -445,7 +443,7 @@ public class TestEventService {
resetListeners();
latch = new CountDownLatch(2);
- LOG.info("Sending event: " + positionChange);
+ log.info("Sending event: {}", positionChange);
service.notifyEvent(positionChange);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
@@ -462,7 +460,7 @@ public class TestEventService {
};
latch = new CountDownLatch(1);
- LOG.info("Sending generic event " + genEvent.getEventId());
+ log.info("Sending generic event {}", genEvent.getEventId());
service.notifyEvent(genEvent);
latch.await(5, TimeUnit.SECONDS);
assertTrue(genericEventListener.processed);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 f3f2cac..bdd49f5 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
@@ -44,10 +44,13 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.testng.Assert;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class TestLensDAO.
*/
@Test(groups = "unit-test")
+@Slf4j
public class TestLensDAO extends LensJerseyTest {
/**
@@ -85,12 +88,12 @@ public class TestLensDAO extends LensJerseyTest {
String jsonMetadata = MAPPER.writeValueAsString(jdbcRsMeta);
- LOG.info("@@@JSON " + jsonMetadata);
+ log.info("@@@JSON {}" + jsonMetadata);
finishedLensQuery.setMetadata(MAPPER.writeValueAsString(jdbcRsMeta));
finishedLensQuery.setMetadataClass(JDBCResultSet.JDBCResultSetMetadata.class.getName());
} catch (SQLException ex) {
- LOG.error("Error creating result set ", ex);
+ log.error("Error creating result set ", ex);
} finally {
if (stmt != null) {
stmt.close();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 0b152bf..f1461bc 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
@@ -42,8 +42,6 @@ import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.common.TestResourceFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.glassfish.jersey.client.ClientConfig;
@@ -64,8 +62,6 @@ import org.testng.annotations.Test;
@Test(groups = "unit-test")
public class TestQueryEndEmailNotifier extends LensJerseyTest {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TestQueryEndEmailNotifier.class);
private static final int NUM_ITERS = 30;
/** The query service. */
QueryExecutionServiceImpl queryService;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/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 ea81e90..c17b28b 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
@@ -57,10 +57,13 @@ import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class TestResultFormatting.
*/
@Test(groups = "unit-test")
+@Slf4j
public class TestResultFormatting extends LensJerseyTest {
/** The query service. */
@@ -235,9 +238,9 @@ public class TestResultFormatting extends LensJerseyTest {
if (qctx == null) {
// This shouldn't occur. It is appearing when query gets purged. So adding extra logs
// for debugging in the future.
- LOG.info("successful query's QueryContext is null");
- LOG.info("query handle: " + handle);
- LOG.info("allQueries: " + queryService.allQueries);
+ log.info("successful query's QueryContext is null");
+ log.info("query handle: {}", handle);
+ log.info("allQueries: {}", queryService.allQueries);
// not doing formatter validation if qctx is null
} else if (!isDir) {
// isDir is true if the formatter is skipped due to result being the max size allowed
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
index 9a79e65..464533d 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
@@ -29,8 +29,6 @@ import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.user.UserConfigLoaderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hive.service.cli.CLIService;
@@ -40,8 +38,10 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class TestSessionClassLoaders {
- private static final Log LOG = LogFactory.getLog(TestSessionClassLoaders.class);
private final HiveConf conf = LensServerConf.createHiveConf();
private HiveSessionService sessionService;
@@ -119,7 +119,7 @@ public class TestSessionClassLoaders {
sessionService.release(sessionHandle);
}
- LOG.info("@@ Teting DB2");
+ log.info("@@ Teting DB2");
// Loading test class should pass for DB1
session.setCurrentDatabase(DB1);
@@ -136,7 +136,7 @@ public class TestSessionClassLoaders {
clz = session.getCubeMetastoreClient().getConf().getClassByName(TestDatabaseResourceService.TEST_CLASS);
Assert.assertNotNull(clz);
} catch (ClassNotFoundException cnf) {
- LOG.error(cnf.getMessage(), cnf);
+ log.error(cnf.getMessage(), cnf);
Assert.fail("Should not have thrown class not found exception: " + cnf.getMessage());
} finally {
sessionService.release(sessionHandle);
@@ -166,7 +166,7 @@ public class TestSessionClassLoaders {
boolean loadedSessionClass = false;
boolean loadedDBClass = false;
try {
- LOG.info("@@@ TEST 1");
+ log.info("@@@ TEST 1");
sessionService.acquire(sessionHandle);
ClassLoader dbClassLoader = session.getClassLoader("default");
@@ -181,7 +181,7 @@ public class TestSessionClassLoaders {
Class clz = Class.forName("ClassLoaderTestClass", true, Thread.currentThread().getContextClassLoader());
loadedDBClass = true;
} catch (ClassNotFoundException cnf) {
- LOG.error(cnf.getMessage(), cnf);
+ log.error(cnf.getMessage(), cnf);
Assert.assertTrue(loadedSessionClass);
Assert.assertFalse(loadedDBClass);
} finally {
@@ -192,7 +192,7 @@ public class TestSessionClassLoaders {
loadedSessionClass = false;
loadedDBClass = false;
try {
- LOG.info("@@@ TEST 1 - cube client");
+ log.info("@@@ TEST 1 - cube client");
sessionService.acquire(sessionHandle);
// testClass2 should be loaded since test2.jar is added to the session
@@ -204,14 +204,14 @@ public class TestSessionClassLoaders {
Class clz = session.getCubeMetastoreClient().getConf().getClassByName("ClassLoaderTestClass");
loadedDBClass = true;
} catch (ClassNotFoundException cnf) {
- LOG.error(cnf.getMessage(), cnf);
+ log.error(cnf.getMessage(), cnf);
Assert.assertTrue(loadedSessionClass);
Assert.assertFalse(loadedDBClass);
} finally {
sessionService.release(sessionHandle);
}
- LOG.info("@@@ TEST 2");
+ log.info("@@@ TEST 2");
session.setCurrentDatabase(DB1);
loadedSessionClass = false;
loadedDBClass = false;
@@ -230,7 +230,7 @@ public class TestSessionClassLoaders {
Assert.assertTrue(loadedSessionClass);
Assert.assertTrue(loadedDBClass);
- LOG.info("@@@ TEST 2 - cube client");
+ log.info("@@@ TEST 2 - cube client");
loadedSessionClass = false;
loadedDBClass = false;
try {
@@ -248,7 +248,7 @@ public class TestSessionClassLoaders {
Assert.assertTrue(loadedDBClass);
// Switch back to default DB, again the test2.jar should be available, test.jar should not be available
- LOG.info("@@@ TEST 3");
+ log.info("@@@ TEST 3");
session.setCurrentDatabase("default");
loadedSessionClass = false;
loadedDBClass = false;
@@ -267,7 +267,7 @@ public class TestSessionClassLoaders {
sessionService.release(sessionHandle);
}
- LOG.info("@@@ TEST 3 -- cube client");
+ log.info("@@@ TEST 3 -- cube client");
session.setCurrentDatabase("default");
loadedSessionClass = false;
loadedDBClass = false;
@@ -282,7 +282,7 @@ public class TestSessionClassLoaders {
Class clz = session.getCubeMetastoreClient().getConf().getClassByName("ClassLoaderTestClass");
loadedDBClass = true;
} catch (ClassNotFoundException cnf) {
- LOG.error(cnf.getMessage(), cnf);
+ log.error(cnf.getMessage(), cnf);
Assert.assertTrue(loadedSessionClass);
Assert.assertFalse(loadedDBClass);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44ec2afd/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
index a122d1e..1656f4e 100644
--- a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
+++ b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
@@ -29,8 +29,6 @@ import org.apache.lens.server.api.user.UserConfigLoader;
import org.apache.lens.server.util.UtilityMethods;
import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.hsqldb.server.Server;
@@ -49,7 +47,6 @@ import liquibase.resource.FileSystemResourceAccessor;
*/
@Test(groups = "unit-test")
public class TestUserConfigLoader {
- public static final Log LOG = LogFactory.getLog(TestUserConfigLoader.class);
/** The conf. */
private HiveConf conf;