ACCUMULO-3320 Fix up whitespace formatting.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cdf01d71 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cdf01d71 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cdf01d71 Branch: refs/heads/master Commit: cdf01d718338ea29f0366e3b652d75c8ae081ccf Parents: d14b4ed Author: Josh Elser <els...@apache.org> Authored: Mon Nov 10 13:46:04 2014 -0800 Committer: Josh Elser <els...@apache.org> Committed: Mon Nov 10 13:46:04 2014 -0800 ---------------------------------------------------------------------- .../CloseWriteAheadLogReferencesTest.java | 36 ++++++++++---------- .../apache/accumulo/tserver/TabletServer.java | 2 +- .../test/performance/thrift/NullTserver.java | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdf01d71/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java ---------------------------------------------------------------------- diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java index 2c0164d..03a2678 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java @@ -379,7 +379,7 @@ public class CloseWriteAheadLogReferencesTest { AccumuloConfiguration conf = EasyMock.createMock(AccumuloConfiguration.class); TInfo tinfo = EasyMock.createMock(TInfo.class); TCredentials tcreds = EasyMock.createMock(TCredentials.class); - + List<String> tservers = Arrays.asList("localhost:12345", "localhost:12346"); EasyMock.expect(closeWals.getActiveTservers(conf, tinfo, tcreds)).andReturn(tservers); int numWals = 0; @@ -387,21 +387,21 @@ public class CloseWriteAheadLogReferencesTest { EasyMock.expect(closeWals.getActiveWalsForServer(conf, tinfo, tcreds, HostAndPort.fromString(tserver))).andReturn(Arrays.asList("/wal" + numWals)); numWals++; } - + EasyMock.replay(closeWals); - + Set<String> wals = closeWals.getActiveWals(conf, tinfo, tcreds); - + EasyMock.verify(closeWals); - + Set<String> expectedWals = new HashSet<String>(); for (int i = 0; i < numWals; i++) { expectedWals.add("/wal" + i); } - + Assert.assertEquals(expectedWals, wals); } - + @Test public void offlineMaster() throws Exception { CloseWriteAheadLogReferences closeWals = EasyMock.createMockBuilder(CloseWriteAheadLogReferences.class).addMockedMethod("getActiveTservers") @@ -409,18 +409,18 @@ public class CloseWriteAheadLogReferencesTest { AccumuloConfiguration conf = EasyMock.createMock(AccumuloConfiguration.class); TInfo tinfo = EasyMock.createMock(TInfo.class); TCredentials tcreds = EasyMock.createMock(TCredentials.class); - + EasyMock.expect(closeWals.getActiveTservers(conf, tinfo, tcreds)).andReturn(null); - + EasyMock.replay(closeWals); - + Set<String> wals = closeWals.getActiveWals(conf, tinfo, tcreds); - + EasyMock.verify(closeWals); - + Assert.assertNull("Expected to get null for active WALs", wals); } - + @Test public void offlineTserver() throws Exception { CloseWriteAheadLogReferences closeWals = EasyMock.createMockBuilder(CloseWriteAheadLogReferences.class).addMockedMethod("getActiveTservers") @@ -428,18 +428,18 @@ public class CloseWriteAheadLogReferencesTest { AccumuloConfiguration conf = EasyMock.createMock(AccumuloConfiguration.class); TInfo tinfo = EasyMock.createMock(TInfo.class); TCredentials tcreds = EasyMock.createMock(TCredentials.class); - + List<String> tservers = Arrays.asList("localhost:12345", "localhost:12346"); EasyMock.expect(closeWals.getActiveTservers(conf, tinfo, tcreds)).andReturn(tservers); EasyMock.expect(closeWals.getActiveWalsForServer(conf, tinfo, tcreds, HostAndPort.fromString("localhost:12345"))).andReturn(Arrays.asList("/wal" + 0)); EasyMock.expect(closeWals.getActiveWalsForServer(conf, tinfo, tcreds, HostAndPort.fromString("localhost:12346"))).andReturn(null); - + EasyMock.replay(closeWals); - + Set<String> wals = closeWals.getActiveWals(conf, tinfo, tcreds); - + EasyMock.verify(closeWals); - + Assert.assertNull("Expected to get null for active WALs", wals); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdf01d71/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 6002789..93161ee 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -1743,7 +1743,7 @@ public class TabletServer implements Runnable { return ret; } - + @Override public List<String> getActiveLogs(TInfo tinfo, TCredentials credentials) throws TException { Set<String> logs = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdf01d71/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java index b6cf727..438b83e 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java @@ -224,7 +224,7 @@ public class NullTserver { @Override public void closeConditionalUpdate(TInfo tinfo, long sessID) throws TException {} - + @Override public List<String> getActiveLogs(TInfo tinfo, TCredentials credentials) throws TException { return null;
