From 379f8a8ed521bd86f2c1dfff7ff7a10a4e1f4322 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Wed, 20 Dec 2017 18:04:56 +0100 Subject: [PATCH] HBASE-19566 Fixed Checkstyle errors in hbase-archetypes and enabled Checkstyle to fail on violations --- .../archetypes/exemplars/client/TestHelloHBase.java | 19 ++++++++----------- .../exemplars/shaded_client/TestHelloHBase.java | 19 ++++++++----------- hbase-archetypes/pom.xml | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java index 4d20919f57..be028bec0d 100644 --- a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java +++ b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java @@ -18,7 +18,10 @@ */ package org.apache.hbase.archetypes.exemplars.client; +import static org.junit.Assert.assertEquals; + import java.io.IOException; + import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.client.Admin; @@ -29,7 +32,6 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; -import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -64,8 +66,7 @@ public class TestHelloHBase { assertEquals("#namespaceExists failed: found nonexistent namespace.", false, exists); - admin.createNamespace - (NamespaceDescriptor.create(EXISTING_NAMESPACE).build()); + admin.createNamespace(NamespaceDescriptor.create(EXISTING_NAMESPACE).build()); exists = HelloHBase.namespaceExists(admin, EXISTING_NAMESPACE); assertEquals("#namespaceExists failed: did NOT find existing namespace.", true, exists); @@ -94,11 +95,9 @@ public class TestHelloHBase { @Test public void testPutRowToTable() throws IOException { Admin admin = TEST_UTIL.getAdmin(); - admin.createNamespace - (NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); + admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); Table table - = TEST_UTIL.createTable - (HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); + = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); HelloHBase.putRowToTable(table); Result row = table.get(new Get(HelloHBase.MY_ROW_ID)); @@ -111,11 +110,9 @@ public class TestHelloHBase { @Test public void testDeleteRow() throws IOException { Admin admin = TEST_UTIL.getAdmin(); - admin.createNamespace - (NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); + admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); Table table - = TEST_UTIL.createTable - (HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); + = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); table.put(new Put(HelloHBase.MY_ROW_ID). addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME, diff --git a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java index e49fbb56fa..1656e35c08 100644 --- a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java +++ b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java @@ -18,7 +18,10 @@ */ package org.apache.hbase.archetypes.exemplars.shaded_client; +import static org.junit.Assert.assertEquals; + import java.io.IOException; + import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.client.Admin; @@ -29,7 +32,6 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; -import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -64,8 +66,7 @@ public class TestHelloHBase { assertEquals("#namespaceExists failed: found nonexistent namespace.", false, exists); - admin.createNamespace - (NamespaceDescriptor.create(EXISTING_NAMESPACE).build()); + admin.createNamespace(NamespaceDescriptor.create(EXISTING_NAMESPACE).build()); exists = HelloHBase.namespaceExists(admin, EXISTING_NAMESPACE); assertEquals("#namespaceExists failed: did NOT find existing namespace.", true, exists); @@ -94,11 +95,9 @@ public class TestHelloHBase { @Test public void testPutRowToTable() throws IOException { Admin admin = TEST_UTIL.getAdmin(); - admin.createNamespace - (NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); + admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); Table table - = TEST_UTIL.createTable - (HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); + = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); HelloHBase.putRowToTable(table); Result row = table.get(new Get(HelloHBase.MY_ROW_ID)); @@ -111,11 +110,9 @@ public class TestHelloHBase { @Test public void testDeleteRow() throws IOException { Admin admin = TEST_UTIL.getAdmin(); - admin.createNamespace - (NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); + admin.createNamespace(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build()); Table table - = TEST_UTIL.createTable - (HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); + = TEST_UTIL.createTable(HelloHBase.MY_TABLE_NAME, HelloHBase.MY_COLUMN_FAMILY_NAME); table.put(new Put(HelloHBase.MY_ROW_ID). addColumn(HelloHBase.MY_COLUMN_FAMILY_NAME, diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml index b0576ef129..58ac89a74d 100644 --- a/hbase-archetypes/pom.xml +++ b/hbase-archetypes/pom.xml @@ -78,6 +78,22 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + + checkstyle + validate + + check + + + true + + + + -- 2.14.3 (Apple Git-98)