Skip to content

Fix for FLUME-625 #10

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

Open
joscha wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for FLUME-625 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb2fb15
FLUME-625: Adds filtering for white spaces, which produced hick-ups
joscha May 1, 2011
66a6393
FLUME-625: Added test cases
joscha May 2, 2011
00238a8
Usability improvement: let the developer know what actually went
joscha May 2, 2011
67df12e
Revert "Usability improvement: let the developer know what actually w…
joscha May 2, 2011
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: 1 addition & 1 deletion flume-core/src/main/java/com/cloudera/flume/conf/FlumeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ public long getEventMaxSizeBytes() {
}

public String getPluginClasses() {
return get(PLUGIN_CLASSES, "");
return get(PLUGIN_CLASSES, "").replaceAll("\\s+", "");
}

public String getHiveHost() {
Expand Down
32 changes: 32 additions & 0 deletions flume-core/src/test/java/com/cloudera/flume/conf/TestFlumeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,38 @@ public TestableConfiguration() {
super(true);
}
}

@Test
public void testPluginClassesWithWhiteSpaceAtBeginning() {
FlumeConfiguration cfg = new TestableConfiguration();
cfg.set(FlumeConfiguration.PLUGIN_CLASSES, " \n a.b.c,d.e.f");

assertEquals("White spaces at the beginning must be stripped", "a.b.c,d.e.f", cfg.getPluginClasses());
}

@Test
public void testPluginClassesWithWhiteSpaceAtEnd() {
FlumeConfiguration cfg = new TestableConfiguration();
cfg.set(FlumeConfiguration.PLUGIN_CLASSES, "a.b.c,d.e.f \n ");

assertEquals("White spaces at the end must be stripped", "a.b.c,d.e.f", cfg.getPluginClasses());
}

@Test
public void testPluginClassesWithWhiteSpaceInTheMiddle() {
FlumeConfiguration cfg = new TestableConfiguration();
cfg.set(FlumeConfiguration.PLUGIN_CLASSES, "a.b.c,\nd.e.f, g.h.i");

assertEquals("White spaces in the middle must be stripped", "a.b.c,d.e.f,g.h.i", cfg.getPluginClasses());
}

@Test
public void testPluginClassesWithWhiteSpace() {
FlumeConfiguration cfg = new TestableConfiguration();
cfg.set(FlumeConfiguration.PLUGIN_CLASSES, " \n a.b.c,\nd.e.f, g.h.i \n ");

assertEquals("White spaces must be stripped", "a.b.c,d.e.f,g.h.i", cfg.getPluginClasses());
}

@Test
public void testParseGossipServers() {
Expand Down