Update

yahoo · Oct 17, 2017 · a01ff04 · a01ff04
1 parent b33c0db
commit a01ff04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/...-core/src/main/java/com/yahoo/bard/webservice/table/resolver/QueryPlanningConstraint.java b/...-core/src/main/java/com/yahoo/bard/webservice/table/resolver/QueryPlanningConstraint.java
@@ -6,9 +6,7 @@
 import com.yahoo.bard.webservice.data.metric.TemplateDruidQuery;
 import com.yahoo.bard.webservice.druid.model.query.Granularity;
 import com.yahoo.bard.webservice.table.LogicalTable;
-import com.yahoo.bard.webservice.web.ApiRequest;
 import com.yahoo.bard.webservice.web.DataApiRequest;
-import com.yahoo.bard.webservice.web.TablesApiRequest;
 
 import org.joda.time.Interval;
 
@@ -52,12 +50,6 @@ public QueryPlanningConstraint(
                 .map(LogicalMetric::getName).collect(Collectors.toSet()));
     }
 
-    public QueryPlanningConstraint(
-            @NotNull TablesApiRequest tablesApiRequest
-    ) {
-        super();
-    }
-
     public LogicalTable getLogicalTable() {
         return logicalTable;
     }

diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/web/endpoints/TablesServlet.java b/fili-core/src/main/java/com/yahoo/bard/webservice/web/endpoints/TablesServlet.java
@@ -11,12 +11,10 @@
 import com.yahoo.bard.webservice.data.filterbuilders.DruidFilterBuilder;
 import com.yahoo.bard.webservice.data.time.GranularityParser;
 import com.yahoo.bard.webservice.logging.RequestLog;
-import com.yahoo.bard.webservice.logging.TimedPhase;
 import com.yahoo.bard.webservice.logging.blocks.TableRequest;
 import com.yahoo.bard.webservice.table.LogicalTable;
 import com.yahoo.bard.webservice.table.LogicalTableDictionary;
 import com.yahoo.bard.webservice.table.PhysicalTable;
-import com.yahoo.bard.webservice.table.TableGroup;
 import com.yahoo.bard.webservice.util.SimplifiedIntervalList;
 import com.yahoo.bard.webservice.web.ErrorMessageFormat;
 import com.yahoo.bard.webservice.web.RequestMapper;
@@ -250,7 +248,7 @@ public Response getTableByGrain(
                 apiRequest = (TablesApiRequest) requestMapper.apply(apiRequest, containerRequestContext);
             }
 
-            Map<String, Object> result = getLogicalTableFullView(apiRequest, uriInfo);
+            Map<String, Object> result = getLogicalTableFullView(apiRequest.getTable(), uriInfo);
             String output = objectMappers.getMapper().writeValueAsString(result);
             LOG.debug("Tables Endpoint Response: {}", output);
             responseSender = () ->  Response.status(OK).entity(output).build();
@@ -273,7 +271,7 @@ public Response getTableByGrain(
         return responseSender.get();
     }
 
-
+    //CHECKSTYLE:OFF
     @GET
     @Timed
     @Produces(MediaType.APPLICATION_JSON)
@@ -337,7 +335,7 @@ public Response getTableAvailability(
                     .build();
         }
     }
-
+    //CHECKSTYLE:ON
 
     /**
      * Get all the tables full view.