Skip to content

HBASE-23623 Reduced the number of Checkstyle violations in hbase-rest #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HorizonNet merged 4 commits into from
Jan 23, 2020
Merged

HBASE-23623 Reduced the number of Checkstyle violations in hbase-rest #1046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ef791e
HBASE-23623 Reduced the number of Checkstyle violations in hbase-rest
HorizonNet Jan 1, 2020
53d9772
HBASE-23623 Fixed Checkstyle violation from build
HorizonNet Jan 15, 2020
df8b99a
HBASE-23623 Fixed review comments
HorizonNet Jan 16, 2020
6d91e24
Merge branch 'branch-1' into HBASE-23623_branch-1
HorizonNet Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
268 changes: 122 additions & 146 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 19 additions & 21 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.hadoop.hbase.rest;

import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -46,7 +45,6 @@

@Category(MediumTests.class)
public class TestGetAndPutResource extends RowResourceBase {

private static final MetricsAssertHelper METRICS_ASSERT =
CompatibilityFactory.getInstance(MetricsAssertHelper.class);

Expand Down Expand Up @@ -110,7 +108,7 @@ public void testSingleCellGetPutXML() throws IOException, JAXBException {
public void testSingleCellGetPutPB() throws IOException, JAXBException {
Response response = getValuePB(TABLE, ROW_1, COLUMN_1);
assertEquals(404, response.getCode());

response = putValuePB(TABLE, ROW_1, COLUMN_1, VALUE_1);
assertEquals(200, response.getCode());
checkValuePB(TABLE, ROW_1, COLUMN_1, VALUE_1);
Expand All @@ -130,7 +128,7 @@ public void testSingleCellGetPutPB() throws IOException, JAXBException {
}

@Test
public void testMultipleCellCheckPutPB() throws IOException, JAXBException {
public void testMultipleCellCheckPutPB() throws IOException {
Response response = getValuePB(TABLE, ROW_1, COLUMN_1);
assertEquals(404, response.getCode());

Expand All @@ -143,7 +141,7 @@ public void testMultipleCellCheckPutPB() throws IOException, JAXBException {
assertEquals(200, response.getCode());
checkValuePB(TABLE, ROW_1, COLUMN_2, VALUE_2);

HashMap<String,String> otherCells = new HashMap<String, String>();
HashMap<String,String> otherCells = new HashMap<>();
otherCells.put(COLUMN_2,VALUE_3);

// On Success update both the cells
Expand Down Expand Up @@ -176,7 +174,7 @@ public void testMultipleCellCheckPutXML() throws IOException, JAXBException {
assertEquals(200, response.getCode());
checkValueXML(TABLE, ROW_1, COLUMN_2, VALUE_2);

HashMap<String,String> otherCells = new HashMap<String, String>();
HashMap<String,String> otherCells = new HashMap<>();
otherCells.put(COLUMN_2,VALUE_3);

// On Success update both the cells
Expand All @@ -196,7 +194,7 @@ public void testMultipleCellCheckPutXML() throws IOException, JAXBException {
}

@Test
public void testMultipleCellCheckDeletePB() throws IOException, JAXBException {
public void testMultipleCellCheckDeletePB() throws IOException {
Response response = getValuePB(TABLE, ROW_1, COLUMN_1);
assertEquals(404, response.getCode());

Expand All @@ -214,7 +212,7 @@ public void testMultipleCellCheckDeletePB() throws IOException, JAXBException {
checkValuePB(TABLE, ROW_1, COLUMN_3, VALUE_3);

// Deletes the following columns based on Column1 check
HashMap<String,String> cellsToDelete = new HashMap<String, String>();
HashMap<String,String> cellsToDelete = new HashMap<>();
cellsToDelete.put(COLUMN_2,VALUE_2); // Value does not matter
cellsToDelete.put(COLUMN_3,VALUE_3); // Value does not matter

Expand Down Expand Up @@ -249,7 +247,7 @@ public void testMultipleCellCheckDeletePB() throws IOException, JAXBException {
assertEquals(200, response.getCode());
}

@Test
@Test
public void testSingleCellGetPutBinary() throws IOException {
final String path = "/" + TABLE + "/" + ROW_3 + "/" + COLUMN_1;
final byte[] body = Bytes.toBytes(VALUE_3);
Expand All @@ -275,7 +273,7 @@ public void testSingleCellGetPutBinary() throws IOException {
}

@Test
public void testSingleCellGetJSON() throws IOException, JAXBException {
public void testSingleCellGetJSON() throws IOException {
final String path = "/" + TABLE + "/" + ROW_4 + "/" + COLUMN_1;
Response response = client.put(path, Constants.MIMETYPE_BINARY,
Bytes.toBytes(VALUE_4));
Expand All @@ -289,7 +287,7 @@ public void testSingleCellGetJSON() throws IOException, JAXBException {
}

@Test
public void testLatestCellGetJSON() throws IOException, JAXBException {
public void testLatestCellGetJSON() throws IOException {
final String path = "/" + TABLE + "/" + ROW_4 + "/" + COLUMN_1;
CellSetModel cellSetModel = new CellSetModel();
RowModel rowModel = new RowModel(ROW_4);
Expand Down Expand Up @@ -336,7 +334,7 @@ public void testURLEncodedKey() throws IOException, JAXBException {
}

@Test
public void testNoSuchCF() throws IOException, JAXBException {
public void testNoSuchCF() throws IOException {
final String goodPath = "/" + TABLE + "/" + ROW_1 + "/" + CFA+":";
final String badPath = "/" + TABLE + "/" + ROW_1 + "/" + "BAD";
Response response = client.post(goodPath, Constants.MIMETYPE_BINARY,
Expand Down Expand Up @@ -524,9 +522,9 @@ public void testMultiCellGetJson() throws IOException, JAXBException {
response = deleteRow(TABLE, ROW_2);
assertEquals(200, response.getCode());
}

@Test
public void testMetrics() throws IOException, JAXBException {
public void testMetrics() throws IOException {
final String path = "/" + TABLE + "/" + ROW_4 + "/" + COLUMN_1;
Response response = client.put(path, Constants.MIMETYPE_BINARY,
Bytes.toBytes(VALUE_4));
Expand All @@ -539,19 +537,19 @@ public void testMetrics() throws IOException, JAXBException {
assertEquals(200, response.getCode());

UserProvider userProvider = UserProvider.instantiate(conf);
METRICS_ASSERT.assertCounterGt("requests", 2l,
METRICS_ASSERT.assertCounterGt("requests", 2L,
RESTServlet.getInstance(conf, userProvider).getMetrics().getSource());

METRICS_ASSERT.assertCounterGt("successfulGet", 0l,
METRICS_ASSERT.assertCounterGt("successfulGet", 0L,
RESTServlet.getInstance(conf, userProvider).getMetrics().getSource());

METRICS_ASSERT.assertCounterGt("successfulPut", 0l,
METRICS_ASSERT.assertCounterGt("successfulPut", 0L,
RESTServlet.getInstance(conf, userProvider).getMetrics().getSource());

METRICS_ASSERT.assertCounterGt("successfulDelete", 0l,
METRICS_ASSERT.assertCounterGt("successfulDelete", 0L,
RESTServlet.getInstance(conf, userProvider).getMetrics().getSource());
}

@Test
public void testMultiColumnGetXML() throws Exception {
String path = "/" + TABLE + "/fakerow";
Expand All @@ -575,8 +573,8 @@ public void testMultiColumnGetXML() throws Exception {
path = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1 + "," + COLUMN_2 + "," + COLUMN_3;
response = client.get(path, Constants.MIMETYPE_XML);
assertEquals(200, response.getCode());
CellSetModel cellSet = (CellSetModel) xmlUnmarshaller.unmarshal(new ByteArrayInputStream(response
.getBody()));
CellSetModel cellSet =
(CellSetModel) xmlUnmarshaller.unmarshal(new ByteArrayInputStream(response.getBody()));
assertTrue(cellSet.getRows().size() == 1);
assertTrue(cellSet.getRows().get(0).getCells().size() == 3);
List<CellModel> cells = cellSet.getRows().get(0).getCells();
Expand Down
44 changes: 23 additions & 21 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
*
/**
Copy link
Contributor

@busbey busbey Jan 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a file header and not a javadoc. shouldn't we be doing /* instead of /**?

Copy link
Contributor Author

@HorizonNet HorizonNet Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Expand All @@ -18,6 +17,11 @@
*/
package org.apache.hadoop.hbase.rest;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -51,8 +55,6 @@
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;

import static org.junit.Assert.*;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Expand All @@ -61,13 +63,13 @@
@Category(MediumTests.class)
public class TestNamespacesInstanceResource {
private static String NAMESPACE1 = "TestNamespacesInstanceResource1";
private static Map<String,String> NAMESPACE1_PROPS = new HashMap<String,String>();
private static Map<String,String> NAMESPACE1_PROPS = new HashMap<>();
private static String NAMESPACE2 = "TestNamespacesInstanceResource2";
private static Map<String,String> NAMESPACE2_PROPS = new HashMap<String,String>();
private static Map<String,String> NAMESPACE2_PROPS = new HashMap<>();
private static String NAMESPACE3 = "TestNamespacesInstanceResource3";
private static Map<String,String> NAMESPACE3_PROPS = new HashMap<String,String>();
private static Map<String,String> NAMESPACE3_PROPS = new HashMap<>();
private static String NAMESPACE4 = "TestNamespacesInstanceResource4";
private static Map<String,String> NAMESPACE4_PROPS = new HashMap<String,String>();
private static Map<String,String> NAMESPACE4_PROPS = new HashMap<>();

private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
Expand All @@ -87,8 +89,8 @@ public static void setUpBeforeClass() throws Exception {
REST_TEST_UTIL.getServletPort()));
testNamespacesInstanceModel = new TestNamespacesInstanceModel();
context = JAXBContext.newInstance(NamespacesInstanceModel.class, TableListModel.class);
jsonMapper = new JacksonProvider()
.locateMapper(NamespacesInstanceModel.class, MediaType.APPLICATION_JSON_TYPE);
jsonMapper = new JacksonProvider().locateMapper(NamespacesInstanceModel.class,
MediaType.APPLICATION_JSON_TYPE);
NAMESPACE1_PROPS.put("key1", "value1");
NAMESPACE2_PROPS.put("key2a", "value2a");
NAMESPACE2_PROPS.put("key2b", "value2b");
Expand Down Expand Up @@ -117,9 +119,9 @@ private static <T> T fromXML(byte[] content)

private NamespaceDescriptor findNamespace(Admin admin, String namespaceName) throws IOException{
NamespaceDescriptor[] nd = admin.listNamespaceDescriptors();
for(int i = 0; i < nd.length; i++){
if(nd[i].getName().equals(namespaceName)){
return nd[i];
for (NamespaceDescriptor namespaceDescriptor : nd) {
if (namespaceDescriptor.getName().equals(namespaceName)) {
return namespaceDescriptor;
}
}
return null;
Expand All @@ -129,18 +131,18 @@ private void checkNamespaceProperties(NamespaceDescriptor nd, Map<String,String>
checkNamespaceProperties(nd.getConfiguration(), testProps);
}

private void checkNamespaceProperties(Map<String,String> namespaceProps,
private void checkNamespaceProperties(Map<String,String> namespaceProps,
Map<String,String> testProps){
assertTrue(namespaceProps.size() == testProps.size());
for(String key: testProps.keySet()){
for (String key: testProps.keySet()) {
assertEquals(testProps.get(key), namespaceProps.get(key));
}
}

private void checkNamespaceTables(List<TableModel> namespaceTables, List<String> testTables){
assertEquals(namespaceTables.size(), testTables.size());
for(int i = 0 ; i < namespaceTables.size() ; i++){
String tableName = ((TableModel) namespaceTables.get(i)).getName();
for (TableModel namespaceTable : namespaceTables) {
String tableName = namespaceTable.getName();
assertTrue(testTables.contains(tableName));
}
}
Expand Down Expand Up @@ -174,7 +176,7 @@ public void testGetNamespaceTablesAndCannotDeleteNamespace() throws IOException,

// Create namespace via admin.
NamespaceDescriptor.Builder nsBuilder = NamespaceDescriptor.create(nsName);
NamespaceDescriptor nsd = nsBuilder.build();
NamespaceDescriptor nsd = nsBuilder.build();
nsd.setConfiguration("key1", "value1");
admin.createNamespace(nsd);

Expand All @@ -189,7 +191,7 @@ public void testGetNamespaceTablesAndCannotDeleteNamespace() throws IOException,
table.addFamily(colDesc);
admin.createTable(table);

Map<String, String> nsProperties = new HashMap<String,String>();
Map<String, String> nsProperties = new HashMap<>();
nsProperties.put("key1", "value1");
List<String> nsTables = Arrays.asList("table1", "table2");

Expand Down Expand Up @@ -357,7 +359,7 @@ public void testNamespaceCreateAndDeleteXMLAndJSON() throws IOException, JAXBExc
}

@Test
public void testNamespaceCreateAndDeletePBAndNoBody() throws IOException, JAXBException {
public void testNamespaceCreateAndDeletePBAndNoBody() throws IOException {
String namespacePath3 = "/namespaces/" + NAMESPACE3;
String namespacePath4 = "/namespaces/" + NAMESPACE4;
NamespacesInstanceModel model3;
Expand Down Expand Up @@ -412,7 +414,7 @@ public void testNamespaceCreateAndDeletePBAndNoBody() throws IOException, JAXBEx
// Check cannot post tables that already exist.
response = client.post(namespacePath3, Constants.MIMETYPE_BINARY, new byte[]{});
assertEquals(403, response.getCode());
response = client.post(namespacePath4, Constants.MIMETYPE_PROTOBUF,
response = client.post(namespacePath4, Constants.MIMETYPE_PROTOBUF,
model4.createProtobufOutput());
assertEquals(403, response.getCode());

Expand Down
14 changes: 7 additions & 7 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
*
/**
Copy link
Contributor

@busbey busbey Jan 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a file header and not a javadoc. shouldn't we be using /* instead of /**?

Copy link
Contributor Author

@HorizonNet HorizonNet Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Expand All @@ -18,6 +17,9 @@
*/
package org.apache.hadoop.hbase.rest;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

import java.io.ByteArrayInputStream;
import java.io.IOException;

Expand All @@ -36,8 +38,6 @@
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;

import static org.junit.Assert.*;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Expand Down Expand Up @@ -79,8 +79,8 @@ private static NamespacesModel fromXML(byte[] content) throws JAXBException {

private boolean doesNamespaceExist(Admin admin, String namespaceName) throws IOException {
NamespaceDescriptor[] nd = admin.listNamespaceDescriptors();
for(int i = 0; i < nd.length; i++) {
if(nd[i].getName().equals(namespaceName)) {
for (NamespaceDescriptor namespaceDescriptor : nd) {
if (namespaceDescriptor.getName().equals(namespaceName)) {
return true;
}
}
Expand Down Expand Up @@ -152,7 +152,7 @@ public void testNamespaceListXMLandJSON() throws IOException, JAXBException {
}

@Test
public void testNamespaceListPBandDefault() throws IOException, JAXBException {
public void testNamespaceListPBandDefault() throws IOException {
String schemaPath = "/namespaces/";
NamespacesModel model;
Response response;
Expand Down
11 changes: 7 additions & 4 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
Copy link
Contributor

@busbey busbey Jan 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a file header and not a javadoc. shouldn't we be using /* instead of /**?

Copy link
Contributor Author

@HorizonNet HorizonNet Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Expand All @@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/package org.apache.hadoop.hbase.rest;
*/
package org.apache.hadoop.hbase.rest;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Expand Down Expand Up @@ -91,7 +92,8 @@ public class TestScannersWithLabels {
private static Unmarshaller unmarshaller;
private static Configuration conf;

private static int insertData(TableName tableName, String column, double prob) throws IOException {
private static int insertData(TableName tableName, String column, double prob)
throws IOException {
byte[] k = new byte[3];
byte[][] famAndQf = KeyValue.parseColumn(Bytes.toBytes(column));

Expand Down Expand Up @@ -177,6 +179,7 @@ public VisibilityLabelsResponse run() throws Exception {
};
SUPERUSER.runAs(action);
}

private static void setAuths() throws Exception {
String[] labels = { SECRET, CONFIDENTIAL, PRIVATE, PUBLIC, TOPSECRET };
try (Connection conn = ConnectionFactory.createConnection(conf)) {
Expand All @@ -185,6 +188,7 @@ private static void setAuths() throws Exception {
throw new IOException(t);
}
}

@Test
public void testSimpleScannerXMLWithLabelsThatReceivesNoData() throws IOException, JAXBException {
final int BATCH_SIZE = 5;
Expand Down Expand Up @@ -237,5 +241,4 @@ public void testSimpleScannerXMLWithLabelsThatReceivesData() throws IOException,
.getBody()));
assertEquals(5, countCellSet(cellSet));
}

}
Loading