From e669510b9808d30cf71188b02afef393d880dddb Mon Sep 17 00:00:00 2001
From: Imran M Yousuf <imyousuf@smartitengineering.com>
Date: Tue, 7 Sep 2010 17:16:13 +0600
Subject: [PATCH] Free executor service implementation of schema info provider

Now always the table name will be provided by the invoker, if table name
is missing then an exception will be thrown.

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
---
 .../com/smartitengineering/dao/impl/hbase/CommonDao.java  | 12 ++++++++----
 .../hbase/spi/impl/SynchronousExecutorServiceImpl.java    | 15 +--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/CommonDao.java b/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/CommonDao.java
index 8036369..8dd5820 100644
--- a/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/CommonDao.java
+++ b/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/CommonDao.java
@@ -120,6 +120,10 @@ public class CommonDao<Template extends PersistentDTO, IdType extends Serializab
     this.infoProvider = infoProvider;
   }
 
+  protected String getDefaultTableName() {
+    return getInfoProvider().getMainTableName();
+  }
+
   protected int getMaxScanRows() {
     return getMaxRows() > 0 ? getMaxRows() : DEFAULT_MAX_ROWS;
   }
@@ -166,7 +170,7 @@ public class CommonDao<Template extends PersistentDTO, IdType extends Serializab
     LinkedHashSet<Future<Template>> set = new LinkedHashSet<Future<Template>>(ids.size());
     LinkedHashSet<Template> resultSet = new LinkedHashSet<Template>(ids.size());
     for (IdType id : ids) {
-      set.add(executorService.executeAsynchronously(null, getByIdCallback(id)));
+      set.add(executorService.executeAsynchronously(getDefaultTableName(), getByIdCallback(id)));
     }
     for (Future<Template> future : set) {
       try {
@@ -181,7 +185,7 @@ public class CommonDao<Template extends PersistentDTO, IdType extends Serializab
 
   @Override
   public Template getById(final IdType id) {
-    return executorService.execute("", getByIdCallback(id));
+    return executorService.execute(getDefaultTableName(), getByIdCallback(id));
   }
 
   protected Callback<Template> getByIdCallback(final IdType id) {
@@ -219,7 +223,7 @@ public class CommonDao<Template extends PersistentDTO, IdType extends Serializab
 
   @Override
   public Template getSingle(final List<QueryParameter> query) {
-    return executorService.execute("", new Callback<Template>() {
+    return executorService.execute(getDefaultTableName(), new Callback<Template>() {
 
       @Override
       public Template call(HTableInterface tableInterface) throws Exception {
@@ -244,7 +248,7 @@ public class CommonDao<Template extends PersistentDTO, IdType extends Serializab
 
   @Override
   public List<Template> getList(final List<QueryParameter> query) {
-    return executorService.execute(null, new Callback<List<Template>>() {
+    return executorService.execute(getDefaultTableName(), new Callback<List<Template>>() {
 
       @Override
       public List<Template> call(HTableInterface tableInterface) throws Exception {
diff --git a/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/spi/impl/SynchronousExecutorServiceImpl.java b/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/spi/impl/SynchronousExecutorServiceImpl.java
index 4a748fe..2acb682 100644
--- a/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/spi/impl/SynchronousExecutorServiceImpl.java
+++ b/smart-hbase-dao/src/main/java/com/smartitengineering/dao/impl/hbase/spi/impl/SynchronousExecutorServiceImpl.java
@@ -20,7 +20,6 @@ package com.smartitengineering.dao.impl.hbase.spi.impl;
 
 import com.smartitengineering.dao.impl.hbase.spi.Callback;
 import com.smartitengineering.dao.impl.hbase.spi.ExecutorService;
-import com.smartitengineering.dao.impl.hbase.spi.SchemaInfoProvider;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -36,15 +35,6 @@ public class SynchronousExecutorServiceImpl implements ExecutorService {
   public static final int DEFAULT_MAX_HTABLE_POOL_SIZE = 3000;
   private Configuration configuration;
   private HTablePool tablePool;
-  private SchemaInfoProvider infoProvider;
-
-  public SchemaInfoProvider getInfoProvider() {
-    return infoProvider;
-  }
-
-  public void setInfoProvider(SchemaInfoProvider infoProvider) {
-    this.infoProvider = infoProvider;
-  }
 
   protected Configuration getConfiguration() {
     if (configuration == null) {
@@ -69,7 +59,7 @@ public class SynchronousExecutorServiceImpl implements ExecutorService {
                                          Callback<ReturnType> callback) {
     final HTableInterface tableInterface;
     if (StringUtils.isBlank(tableName)) {
-      tableInterface = getDefaultTable();
+      throw new IllegalArgumentException("Table name not provided!");
     }
     else {
       tableInterface = getTablePool().getTable(tableName);
@@ -92,7 +82,4 @@ public class SynchronousExecutorServiceImpl implements ExecutorService {
     }
   }
 
-  protected HTableInterface getDefaultTable() {
-    return getTablePool().getTable(getInfoProvider().getMainTableName());
-  }
 }
-- 
2.11.4.GIT