Skip to content

HBASE-23646 Resolved remaining Checkstyle violations in tests of hbase-rest #1025

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
merged 3 commits into from
Jan 20, 2020
+474 −494
Merged

HBASE-23646 Resolved remaining Checkstyle violations in tests of hbase-rest #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
070f8d9
HBASE-23646 Resolved remaining Checkstyle violations in tests of hbas…
HorizonNet Jan 11, 2020
9493437
HBASE-23646 Fixed review comment
HorizonNet Jan 16, 2020
857d550
Merge branch 'branch-1' into HBASE-23646_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
2 changes: 2 additions & 0 deletions hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@
<suppress checks="MagicNumberCheck" files=".*Test\.java"/>
<!-- Will not have a private constructor, because it is InterfaceAudience.Public -->
<suppress checks="HideUtilityClassConstructor" files="org.apache.hadoop.hbase.util.ByteRangeUtils"/>
<suppress checks="InnerAssignment" files="org.apache.hadoop.hbase.rest.PerformanceEvaluation"/>
<suppress checks="EmptyBlock" files="org.apache.hadoop.hbase.rest.PerformanceEvaluation"/>
</suppressions>
19 changes: 10 additions & 9 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.sun.jersey.spi.container.servlet.ServletContainer;

public class HBaseRESTTestingUtility {

private static final Log LOG = LogFactory.getLog(HBaseRESTTestingUtility.class);

private int testServletPort;
Expand Down Expand Up @@ -62,7 +61,7 @@ public void startServletContainer(Configuration conf) throws Exception {
"jetty");

LOG.info("configured " + ServletContainer.class.getName());

// set up Jetty and run the embedded server
server = new Server(0);
server.setSendServerVersion(false);
Expand All @@ -86,17 +85,19 @@ public void startServletContainer(Configuration conf) throws Exception {
// get the port
testServletPort = server.getConnectors()[0].getLocalPort();

LOG.info("started " + server.getClass().getName() + " on port " +
LOG.info("started " + server.getClass().getName() + " on port " +
testServletPort);
}

public void shutdownServletContainer() {
if (server != null) try {
server.stop();
server = null;
RESTServlet.stop();
} catch (Exception e) {
LOG.warn(StringUtils.stringifyException(e));
if (server != null) {
try {
server.stop();
server = null;
RESTServlet.stop();
} catch (Exception e) {
LOG.warn(StringUtils.stringifyException(e));
}
}
}
}
Loading