From 677159acde72601b151a192980eb2e5704a9e824 Mon Sep 17 00:00:00 2001 From: Colm O hEigeartaigh Date: Wed, 7 Feb 2018 10:48:01 +0000 Subject: [PATCH] EAGLE-1084 - Apply checkstyle fixes to eagle-storage-base module --- .../org/apache/eagle/storage/DataStorage.java | 8 +- .../eagle/storage/DataStorageManager.java | 73 ++++++++--------- .../IllegalDataStorageException.java | 2 +- .../IllegalDataStorageTypeException.java | 2 +- .../storage/operation/CompiledQuery.java | 81 ++++++++++--------- .../storage/operation/CreateStatement.java | 10 +-- .../storage/operation/DeleteStatement.java | 30 +++---- .../storage/operation/QueryStatement.java | 4 +- .../eagle/storage/operation/RawQuery.java | 18 +++-- .../operation/RowkeyQueryStatement.java | 2 +- .../storage/operation/UpdateStatement.java | 4 +- .../apache/eagle/storage/result/Result.java | 7 +- .../storage/spi/DataStorageServiceLoader.java | 2 +- .../org/apache/eagle/storage/TestUri.java | 2 +- .../storage/operation/TestCompiledQuery.java | 2 +- .../operation/TestCreateStatement.java | 2 - .../operation/TestUpdateStatement.java | 1 - .../spi/TestDataStorageServiceProvider.java | 2 +- 18 files changed, 132 insertions(+), 120 deletions(-) diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorage.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorage.java index 4347401005..314d29aed5 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorage.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorage.java @@ -70,18 +70,18 @@ public interface DataStorage { ModifyResult delete(List entities, EntityDefinition entityDefinition) throws IOException; /** - * Execute delete operation by entity ids + * Execute delete operation * * @throws IOException */ - ModifyResult deleteByID(List ids, EntityDefinition entityDefinition) throws IOException; + ModifyResult delete(CompiledQuery query, EntityDefinition entityDefinition) throws IOException; /** - * Execute delete operation + * Execute delete operation by entity ids * * @throws IOException */ - ModifyResult delete(CompiledQuery query, EntityDefinition entityDefinition) throws IOException; + ModifyResult deleteByID(List ids, EntityDefinition entityDefinition) throws IOException; /** * Execute query to return a list of results, may not always tagged entities diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorageManager.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorageManager.java index a47af9f82d..8ea1630973 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorageManager.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/DataStorageManager.java @@ -31,10 +31,12 @@ * @since 3/20/15 */ public class DataStorageManager { - public final static String EAGLE_STORAGE_TYPE = "eagle.service.storage-type"; - public final static String DEFAULT_DATA_STORAGE_TYPE = "hbase"; + public static final String EAGLE_STORAGE_TYPE = "eagle.service.storage-type"; + public static final String DEFAULT_DATA_STORAGE_TYPE = "hbase"; - private final static Logger LOG = LoggerFactory.getLogger(DataStorageManager.class); + private static final Logger LOG = LoggerFactory.getLogger(DataStorageManager.class); + + private static DataStorage singletonStorageInstance; /** * Get data storage without cache @@ -58,39 +60,6 @@ public static DataStorage newDataStorage(String type) throws IllegalDataStorageT return dataStorage; } - private static DataStorage singletonStorageInstance; - - /** - * get storage class by type configured as eagle.storage.type from eagle configuration: config.properties - * - * @return DataStorage instance - * @throws IllegalDataStorageTypeException - */ - public synchronized static DataStorage getDataStorageByEagleConfig(boolean cache) throws IllegalDataStorageTypeException { - String storageType = EagleConfigFactory.load().getStorageType(); - - if (!cache) { - return newDataStorage(storageType); - } - - if (singletonStorageInstance == null) { - if (storageType == null) { - LOG.error(EAGLE_STORAGE_TYPE + " is null, trying default data storage: " + DEFAULT_DATA_STORAGE_TYPE); - storageType = DEFAULT_DATA_STORAGE_TYPE; - } - singletonStorageInstance = newDataStorage(storageType); - } - return singletonStorageInstance; - } - - /** - * @return DataStorage instance by singleton pattern - * @throws IllegalDataStorageTypeException - */ - public synchronized static DataStorage getDataStorageByEagleConfig() throws IllegalDataStorageTypeException { - return getDataStorageByEagleConfig(true); - } - /** * Get data storage by configuration * @@ -121,4 +90,36 @@ public static DataStorage newDataStorage(Properties properties) throws IllegalDa } return newDataStorage(storageType); } + + /** + * get storage class by type configured as eagle.storage.type from eagle configuration: config.properties + * + * @return DataStorage instance + * @throws IllegalDataStorageTypeException + */ + public static synchronized DataStorage getDataStorageByEagleConfig(boolean cache) throws IllegalDataStorageTypeException { + String storageType = EagleConfigFactory.load().getStorageType(); + + if (!cache) { + return newDataStorage(storageType); + } + + if (singletonStorageInstance == null) { + if (storageType == null) { + LOG.error(EAGLE_STORAGE_TYPE + " is null, trying default data storage: " + DEFAULT_DATA_STORAGE_TYPE); + storageType = DEFAULT_DATA_STORAGE_TYPE; + } + singletonStorageInstance = newDataStorage(storageType); + } + return singletonStorageInstance; + } + + /** + * @return DataStorage instance by singleton pattern + * @throws IllegalDataStorageTypeException + */ + public static synchronized DataStorage getDataStorageByEagleConfig() throws IllegalDataStorageTypeException { + return getDataStorageByEagleConfig(true); + } + } \ No newline at end of file diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageException.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageException.java index ddd520dca3..8d2c804a5c 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageException.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageException.java @@ -19,7 +19,7 @@ /** * @since 3/20/15 */ -public class IllegalDataStorageException extends Exception{ +public class IllegalDataStorageException extends Exception { public IllegalDataStorageException() { super(); } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageTypeException.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageTypeException.java index e0b99d9f37..3ef7758590 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageTypeException.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/exception/IllegalDataStorageTypeException.java @@ -19,7 +19,7 @@ /** * @since 3/20/15 */ -public class IllegalDataStorageTypeException extends Exception{ +public class IllegalDataStorageTypeException extends Exception { public IllegalDataStorageTypeException() { super(); } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CompiledQuery.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CompiledQuery.java index 9ec5751519..5c23016bbd 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CompiledQuery.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CompiledQuery.java @@ -40,8 +40,21 @@ * @since 3/23/15 */ public class CompiledQuery { - private final static Logger LOG = LoggerFactory.getLogger(CompiledQuery.class); + private static final Logger LOG = LoggerFactory.getLogger(CompiledQuery.class); private boolean timeSeries; + private String serviceName; + private SearchCondition searchCondition; + private final RawQuery rawQuery; + private boolean hasAgg; + private List aggregateFunctionTypes; + private List sortOptions; + private List sortFunctions; + private List sortFields; + private List groupByFields; + + private long startTime; + private long endTime; + private List aggregateFields; public boolean isHasAgg() { return hasAgg; @@ -84,7 +97,6 @@ public void setSortFields(List sortFields) { } public static Logger getLog() { - return LOG; } @@ -108,18 +120,6 @@ public RawQuery getRawQuery() { return rawQuery; } - private String serviceName; - private SearchCondition searchCondition; - private final RawQuery rawQuery; - private boolean hasAgg; - private List aggregateFunctionTypes; - private List sortOptions; - private List sortFunctions; - private List sortFields; - private List groupByFields; - - private long startTime; - public long getEndTime() { return endTime; } @@ -136,8 +136,6 @@ public void setStartTime(long startTime) { this.startTime = startTime; } - private long endTime; - public List getAggregateFields() { return aggregateFields; } @@ -146,8 +144,6 @@ public void setAggregateFields(List aggregateFields) { this.aggregateFields = aggregateFields; } - private List aggregateFields; - public CompiledQuery(RawQuery rawQueryCondition) throws QueryCompileException { this.rawQuery = rawQueryCondition; try { @@ -165,19 +161,22 @@ public void setGroupByFields(List groupByFields) { this.groupByFields = groupByFields; } - private void validateQueryParameters(String startRowkey, int pageSize){ - if(pageSize < 0){ - throw new IllegalArgumentException("Positive pageSize value should be always provided. The list query format is:\n" + "eagle-service/rest/list?query=&pageSize=10&startRowkey=xyz&startTime=xxx&endTime=xxx"); + private void validateQueryParameters(String startRowkey, int pageSize) { + if (pageSize < 0) { + throw new IllegalArgumentException("Positive pageSize value should be always provided. The list query format is:\n" + + "eagle-service/rest/list?query=&pageSize=10&startRowkey=xyz&startTime=xxx&endTime=xxx"); } - if(startRowkey != null && startRowkey.equals("null")){ + if (startRowkey != null && startRowkey.equals("null")) { LOG.warn("startRowkey being null string is not same to startRowkey == null"); } return; } - private void checkNotNull(Object obj,String name){ - if(obj == null) throw new IllegalArgumentException(name+" should not be null"); + private void checkNotNull(Object obj, String name) { + if (obj == null) { + throw new IllegalArgumentException(name + " should not be null"); + } } protected void compile() throws Exception { @@ -192,7 +191,7 @@ protected void compile() throws Exception { this.searchCondition.setOutputAlias(compiler.getOutputAlias()); this.searchCondition.setFilter(compiler.filter()); this.searchCondition.setQueryExpression(compiler.getQueryExpression()); - if(compiler.sortOptions() == null && this.rawQuery.getTop() > 0) { + if (compiler.sortOptions() == null && this.rawQuery.getTop() > 0) { LOG.warn("Parameter \"top\" is only used for sort query! Ignore top parameter this time since it's not a sort query"); } @@ -212,12 +211,12 @@ protected void compile() throws Exception { // 3. Set time range if it's timeseries service EntityDefinition ed = EntityDefinitionManager.getEntityByServiceName(serviceName); - if(ed.isTimeSeries()){ + if (ed.isTimeSeries()) { // TODO check Time exists for timeseries or topology data long endTimeMillis = System.currentTimeMillis(); long startTimeMills = endTimeMillis - 30 * DateTimeUtil.ONEDAY; - if(this.rawQuery.getStartTime() != null && this.rawQuery.getEndTime() != null) { + if (this.rawQuery.getStartTime() != null && this.rawQuery.getEndTime() != null) { endTimeMillis = DateTimeUtil.parseTimeStrToMilliseconds(rawQuery.getEndTime()); startTimeMills = DateTimeUtil.parseTimeStrToMilliseconds(rawQuery.getStartTime()); } else { @@ -227,7 +226,7 @@ protected void compile() throws Exception { this.searchCondition.setEndTime(endTimeMillis); this.setStartTime(startTimeMills); this.setEndTime(endTimeMillis); - }else{ + } else { this.searchCondition.setStartTime(0); this.searchCondition.setEndTime(1); this.setStartTime(0); @@ -244,21 +243,29 @@ protected void compile() throws Exception { List outputFields = compiler.outputFields(); List groupbyFields = compiler.groupbyFields(); List aggregateFields = compiler.aggregateFields(); - Set filterFields = compiler.getFilterFields(); // Start to generate output fields list { searchCondition.setOutputAll(compiler.isOutputAll()); - if(outputFields == null) outputFields = new ArrayList(); - if(compiler.hasAgg()){ - if(groupbyFields != null) outputFields.addAll(groupbyFields); - if(aggregateFields != null) outputFields.addAll(aggregateFields); - if(GenericMetricEntity.GENERIC_METRIC_SERVICE.equals(serviceName) && !outputFields.contains(GenericMetricEntity.VALUE_FIELD)){ + if (outputFields == null) { + outputFields = new ArrayList(); + } + if (compiler.hasAgg()) { + if (groupbyFields != null) { + outputFields.addAll(groupbyFields); + } + if (aggregateFields != null) { + outputFields.addAll(aggregateFields); + } + if (GenericMetricEntity.GENERIC_METRIC_SERVICE.equals(serviceName) && !outputFields.contains(GenericMetricEntity.VALUE_FIELD)) { outputFields.add(GenericMetricEntity.VALUE_FIELD); } } - if(filterFields!=null) outputFields.addAll(filterFields); + Set filterFields = compiler.getFilterFields(); + if (filterFields != null) { + outputFields.addAll(filterFields); + } searchCondition.setOutputFields(outputFields); - if(LOG.isDebugEnabled()) { + if (LOG.isDebugEnabled()) { if (compiler.isOutputAll()) { LOG.debug("Output fields: all"); } else { @@ -275,7 +282,7 @@ public void setTimeSeries(boolean timeSeries) { this.timeSeries = timeSeries; } - public long getIntervalMin(){ + public long getIntervalMin() { return this.getRawQuery().getIntervalmin(); } } \ No newline at end of file diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CreateStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CreateStatement.java index 80256e1358..13fcc60638 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CreateStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/CreateStatement.java @@ -32,7 +32,7 @@ public class CreateStatement implements Statement> { private final List entities; private final EntityDefinition entityDefinition; - public CreateStatement(List entities,String serviceName){ + public CreateStatement(List entities,String serviceName) { this.entities = entities; try { @@ -44,14 +44,14 @@ public CreateStatement(List entities,String servic } } - public CreateStatement(List entities,EntityDefinition entityDefinition){ + public CreateStatement(List entities,EntityDefinition entityDefinition) { this.entities = entities; this.entityDefinition = entityDefinition; } - private void checkNotNull(Object obj,String fieldName){ - if(obj == null){ - throw new IllegalArgumentException(fieldName+" is null"); + private void checkNotNull(Object obj, String fieldName) { + if (obj == null) { + throw new IllegalArgumentException(fieldName + " is null"); } } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/DeleteStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/DeleteStatement.java index 37f5397ebb..d4733e4c8c 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/DeleteStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/DeleteStatement.java @@ -36,7 +36,7 @@ public class DeleteStatement implements Statement> { private EntityDefinition entityDefinition; - public DeleteStatement(String serviceName){ + public DeleteStatement(String serviceName) { try { this.entityDefinition = EntityDefinitionManager.getEntityByServiceName(serviceName); } catch (InstantiationException e) { @@ -46,7 +46,7 @@ public DeleteStatement(String serviceName){ } } - public DeleteStatement(Class entityClass){ + public DeleteStatement(Class entityClass) { try { this.entityDefinition = EntityDefinitionManager.getEntityDefinitionByEntityClass(entityClass); } catch (InstantiationException e) { @@ -56,41 +56,41 @@ public DeleteStatement(Class entityClass){ } } - public DeleteStatement(RawQuery query){ + public DeleteStatement(RawQuery query) { this.query = query; } - public void setIds(List ids){ + public void setIds(List ids) { this.ids = ids; } - public void setEntities(List entities){ + public void setEntities(List entities) { this.entities = entities; } -// public void setQuery(RawQuery query){ -// this.query = query; -// } + // public void setQuery(RawQuery query) { + // this.query = query; + // } @SuppressWarnings("unchecked") @Override - public ModifyResult execute(DataStorage storage) throws IOException{ + public ModifyResult execute(DataStorage storage) throws IOException { ModifyResult result; try { - if(this.ids !=null){ + if (this.ids != null) { result = storage.deleteByID(this.ids,this.entityDefinition); - }else if(this.entities != null){ - result =storage.delete(this.entities, this.entityDefinition); - }else if(this.query != null){ + } else if (this.entities != null) { + result = storage.delete(this.entities, this.entityDefinition); + } else if (this.query != null) { CompiledQuery compiledQuery = storage.compile(this.query); this.entityDefinition = EntityDefinitionManager.getEntityByServiceName(compiledQuery.getServiceName()); result = storage.delete(compiledQuery,this.entityDefinition); - }else{ + } else { throw new IllegalStateException("bad delete statement, not given enough parameters"); } } catch (QueryCompileException e) { throw new IOException(e); - }catch (Exception ex){ + } catch (Exception ex) { throw new IOException(ex); } return result; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/QueryStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/QueryStatement.java index ca40961e7c..44f6fe0766 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/QueryStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/QueryStatement.java @@ -27,10 +27,10 @@ /** * @since 3/18/15 */ -public class QueryStatement implements Statement>{ +public class QueryStatement implements Statement> { private final RawQuery query; - public QueryStatement(RawQuery queryCondition){ + public QueryStatement(RawQuery queryCondition) { this.query = queryCondition; } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java index 97416384ef..c457d5de7a 100755 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java @@ -142,17 +142,21 @@ public void setMetricName(String metricName) { this.metricName = metricName; } - public static Builder build(){ + public static Builder build() { return new Builder(); } - public static class Builder{ + + public static class Builder { private final RawQuery rawQuery; - public Builder(){ - this.rawQuery= new RawQuery(); + + public Builder() { + this.rawQuery = new RawQuery(); } - public RawQuery done(){ + + public RawQuery done() { return this.rawQuery; } + public Builder query(String query) { this.rawQuery.setQuery(query); return this; @@ -214,7 +218,9 @@ public Builder metricName(String metricName) { } public Builder verbose(Boolean verbose) { - if(verbose == null) verbose = true; + if (verbose == null) { + verbose = true; + } this.rawQuery.setVerbose(verbose); return this; } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RowkeyQueryStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RowkeyQueryStatement.java index 017224c6cb..68456f2120 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RowkeyQueryStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RowkeyQueryStatement.java @@ -28,7 +28,7 @@ /** * @since 6/29/15 */ -public class RowkeyQueryStatement implements Statement>{ +public class RowkeyQueryStatement implements Statement> { private final List rowkeys; private final EntityDefinition entityDefinition; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/UpdateStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/UpdateStatement.java index 1c59e0bfba..7dc683e090 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/UpdateStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/UpdateStatement.java @@ -33,7 +33,7 @@ public class UpdateStatement implements Statement> { private final EntityDefinition entityDefinition; - public UpdateStatement(List entities,String serviceName){ + public UpdateStatement(List entities,String serviceName) { this.entities = entities; try { this.entityDefinition = EntityDefinitionManager.getEntityByServiceName(serviceName); @@ -44,7 +44,7 @@ public UpdateStatement(List entities,String servic } } - public UpdateStatement(List entities,EntityDefinition entityDefinition){ + public UpdateStatement(List entities,EntityDefinition entityDefinition) { this.entities = entities; this.entityDefinition = entityDefinition; } diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/result/Result.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/result/Result.java index 492be08989..ee5afdeded 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/result/Result.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/result/Result.java @@ -20,6 +20,10 @@ * @since 3/18/15 */ public class Result { + private boolean success; + + private int size; + public boolean isSuccess() { return success; } @@ -27,9 +31,6 @@ public boolean isSuccess() { public void setSuccess(boolean success) { this.success = success; } - private boolean success; - - private int size; public void setSize(int size) { this.size = size; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/spi/DataStorageServiceLoader.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/spi/DataStorageServiceLoader.java index 2d747abb0e..c95fe3e012 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/spi/DataStorageServiceLoader.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/spi/DataStorageServiceLoader.java @@ -26,7 +26,7 @@ * @since 3/20/15 */ public class DataStorageServiceLoader { - private final Logger LOG = LoggerFactory.getLogger(DataStorageServiceLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(DataStorageServiceLoader.class); private final ServiceLoader serviceLoader; private final Map storageServiceProviders; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/TestUri.java b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/TestUri.java index 0976bbbee9..cea7a77b8e 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/TestUri.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/TestUri.java @@ -26,7 +26,7 @@ */ public class TestUri { @Test - public void testUri(){ + public void testUri() { String url = "eagle:hbase://zk1:2181,zk2:2181/hbase?connectionTimeout=12"; String cleanURI = url.substring(6); diff --git a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCompiledQuery.java b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCompiledQuery.java index a59a5d83dd..467324408d 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCompiledQuery.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCompiledQuery.java @@ -36,7 +36,7 @@ public class TestCompiledQuery { static EntityDefinition entityDefinition = null; - final String queryStr = "TestTimeSeriesAPIEntity[@cluster=\"c4ut\"]{*}"; + final String queryStr = "TestTimeSeriesAPIEntity[@cluster =\"c4ut\"]{*}"; final int pageSize = 1000; final long baseTimestamp = createTimeStamp(2017, 0, 11, 0, 0, 0); final String startTime = DateTimeUtil.millisecondsToHumanDateWithSeconds(baseTimestamp); diff --git a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCreateStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCreateStatement.java index 60a08390a9..a08bb8b53e 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCreateStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestCreateStatement.java @@ -20,8 +20,6 @@ import org.apache.eagle.log.entity.test.TestTimeSeriesAPIEntity; import org.apache.eagle.storage.DataStorage; import org.junit.Test; -import org.mockito.Mock; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestUpdateStatement.java b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestUpdateStatement.java index f08e020d29..3f8da557b8 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestUpdateStatement.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/operation/TestUpdateStatement.java @@ -21,7 +21,6 @@ import org.apache.eagle.storage.DataStorage; import org.junit.Test; -import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/spi/TestDataStorageServiceProvider.java b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/spi/TestDataStorageServiceProvider.java index 0920c10f44..274a2cd76d 100644 --- a/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/spi/TestDataStorageServiceProvider.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/test/java/org/apache/eagle/storage/spi/TestDataStorageServiceProvider.java @@ -23,7 +23,7 @@ * @since 3/20/15 */ public class TestDataStorageServiceProvider implements DataStorageServiceProvider { - private final static String TEST = "test"; + private static final String TEST = "test"; @Override public String getType() {