Skip to content

Commit 7be85d6

Browse files
CrimCrim
authored
Rename interface method and fix travis tests
1 parent f4a5185 commit 7be85d6

File tree

14 files changed

+38
-23
lines changed

14 files changed

+38
-23
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
language: java
22
sudo: false
33
jdk:
4-
- oraclejdk8
4+
- oraclejdk8
5+
cache:
6+
directories:
7+
- $HOME/.m2
8+
- kafka-webview-ui/src/main/frontend/node_modules/
9+
before_script:
10+
- mkdir -p ./data/uploads

‎kafka-webview-plugin/src/main/java/org/sourcelab/kafka/webview/ui/plugin/filter/RecordFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ default Set<String> getOptionNames() {
5050
/**
5151
* Configure this class.
5252
* @param consumerConfigs Consumer configuration in key/value pairs
53-
* @param filterOptions User defined filter options.
53+
* @param filterOptions User defined options for the implementation.
5454
*/
5555
void configure(final Map<String, ?> consumerConfigs, final Map<String, String> filterOptions);
5656

@@ -66,7 +66,7 @@ default Set<String> getOptionNames() {
6666
* @param value Deserialized Value object.
6767
* @return True means the record WILL be shown. False means the record will NOT be shown.
6868
*/
69-
boolean filter(final String topic, final int partition, final long offset, final Object key, final Object value);
69+
boolean includeRecord(final String topic, final int partition, final long offset, final Object key, final Object value);
7070

7171
/**
7272
* Called on closing.

‎kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/kafka/filter/RecordFilterInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ConsumerRecords onConsume(final ConsumerRecords records) {
6464
// Iterate through filters
6565
for (final RecordFilterDefinition recordFilterDefinition : recordFilterDefinitions) {
6666
// Pass through filter
67-
result = recordFilterDefinition.getRecordFilter().filter(
67+
result = recordFilterDefinition.getRecordFilter().includeRecord(
6868
record.topic(),
6969
record.partition(),
7070
record.offset(),

‎kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/ui/FlashMessage.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
public class FlashMessage {
3131
private final String type;
3232
private final String message;
33-
private boolean warning;
3433

3534
private FlashMessage(final String type, final String message) {
3635
this.type = type;
@@ -77,4 +76,11 @@ public static FlashMessage newDanger(final String message) {
7776
return new FlashMessage("danger", message);
7877
}
7978

79+
@Override
80+
public String toString() {
81+
return "FlashMessage{"
82+
+ "type='" + type + '\''
83+
+ ", message='" + message + '\''
84+
+ '}';
85+
}
8086
}

‎kafka-webview-ui/src/main/resources/templates/home/helpContent.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ <h2>Writing Custom Filters</h2>
210210
</em><em style="color:#629755; font-style:italic"> * </em><em style="color:#629755; font-style:italic; font-weight:bold">@param </em><em style="color:#8a653b; font-style:italic">value </em><em style="color:#629755; font-style:italic">Deserialized Value object.
211211
</em><em style="color:#629755; font-style:italic"> * </em><em style="color:#629755; font-style:italic; font-weight:bold">@return </em><em style="color:#629755; font-style:italic">True means the record WILL be shown. False means the record will NOT be shown.
212212
</em><em style="color:#629755; font-style:italic"> */
213-
</em><em style="color:#629755; font-style:italic"> </em><span style="color:#cc7832">boolean </span><span style="color:#ffc66d">filter</span>(<span style="color:#cc7832">final </span>String topic<span style="color:#cc7832">, final int </span>partition<span style="color:#cc7832">, final long </span>offset<span style="color:#cc7832">, final </span>Object key<span style="color:#cc7832">, final </span>Object value)<span style="color:#cc7832">;
213+
</em><em style="color:#629755; font-style:italic"> </em><span style="color:#cc7832">boolean </span><span style="color:#ffc66d">includeRecord</span>(<span style="color:#cc7832">final </span>String topic<span style="color:#cc7832">, final int </span>partition<span style="color:#cc7832">, final long </span>offset<span style="color:#cc7832">, final </span>Object key<span style="color:#cc7832">, final </span>Object value)<span style="color:#cc7832">;
214214
</span>
215215
<span style="color:#cc7832"> </span><em style="color:#629755; font-style:italic">/**
216216
</em><em style="color:#629755; font-style:italic"> * Called on closing.

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/controller/configuration/AbstractMvcTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public abstract class AbstractMvcTest {
6060
protected UserDetails adminUserDetails;
6161

6262
protected User nonAdminUser;
63-
protected UserDetails nonAdminUserDetials;
63+
protected UserDetails nonAdminUserDetails;
6464

6565
/**
6666
* Where JKS files are uploaded to.
@@ -78,7 +78,7 @@ public void setupAuth() {
7878

7979
// Create non-admin user
8080
nonAdminUser = userTestTools.createUser();
81-
nonAdminUserDetials = customUserDetailsService.loadUserByUsername(nonAdminUser.getEmail());
81+
nonAdminUserDetails = customUserDetailsService.loadUserByUsername(nonAdminUser.getEmail());
8282

8383
// Define upload path
8484
uploadPath = appProperties.getUploadPath();
@@ -99,7 +99,7 @@ protected void testUrlWithOutAdminRole(final String url, final boolean isPost) t
9999
}
100100

101101
mockMvc
102-
.perform(action.with(user(nonAdminUserDetials)))
102+
.perform(action.with(user(nonAdminUserDetails)))
103103
.andDo(print())
104104
.andExpect(status().isForbidden());
105105
}

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/controller/configuration/user/UserControllerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void testLoadEditForOtherUserAsAdminUser() throws Exception {
123123
public void testLoadEditSelfAsNonAdminUser() throws Exception {
124124
// Hit edit page for same user as logged in with.
125125
mockMvc
126-
.perform(get("/configuration/user/edit/" + nonAdminUser.getId()).with(user(nonAdminUserDetials)))
126+
.perform(get("/configuration/user/edit/" + nonAdminUser.getId()).with(user(nonAdminUserDetails)))
127127
.andDo(print())
128128
.andExpect(status().isOk())
129129

@@ -142,7 +142,7 @@ public void testLoadEditSelfAsNonAdminUser() throws Exception {
142142
public void testLoadEditAnotherUserAsNonAdminUserIsBlocked() throws Exception {
143143
// Hit edit page for same user as logged in with.
144144
mockMvc
145-
.perform(get("/configuration/user/edit/" + adminUser.getId()).with(user(nonAdminUserDetials)))
145+
.perform(get("/configuration/user/edit/" + adminUser.getId()).with(user(nonAdminUserDetails)))
146146
.andDo(print())
147147
.andExpect(status().is3xxRedirection())
148148
.andExpect(redirectedUrl("/"));

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/KafkaConsumerFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public void configure(final Map<String, ?> consumerConfigs, final Map<String, St
344344
}
345345

346346
@Override
347-
public boolean filter(final String topic, final int partition, final long offset, final Object key, final Object value) {
347+
public boolean includeRecord(final String topic, final int partition, final long offset, final Object key, final Object value) {
348348
// Filter partition 0 records
349349
if (partition == 0) {
350350
return false;

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/WebKafkaConsumerFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public void configure(final Map<String, ?> consumerConfigs, final Map<String, St
311311
}
312312

313313
@Override
314-
public boolean filter(final String topic, final int partition, final long offset, final Object key, final Object value) {
314+
public boolean includeRecord(final String topic, final int partition, final long offset, final Object key, final Object value) {
315315
return partition != partition;
316316
}
317317

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/filter/RecordFilterInterceptorTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public void testPassThrough() {
104104
final RecordFilter mockFilter1 = mock(RecordFilter.class);
105105
final RecordFilter mockFilter2 = mock(RecordFilter.class);
106106

107-
when(mockFilter1.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
108-
when(mockFilter2.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
107+
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
108+
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
109109

110110
final RecordFilterDefinition recordFilterDefinition1 = new RecordFilterDefinition(mockFilter1, new HashMap<>());
111111
final RecordFilterDefinition recordFilterDefinition2 = new RecordFilterDefinition(mockFilter2, new HashMap<>());
@@ -131,9 +131,9 @@ public void testPassThrough() {
131131

132132
// Verify mocks
133133
verify(mockFilter1, times(totalRecords))
134-
.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
134+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
135135
verify(mockFilter2, times(totalRecords))
136-
.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
136+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
137137
}
138138

139139
/**
@@ -147,9 +147,9 @@ public void testFilterMessages() {
147147
final RecordFilter mockFilter1 = mock(RecordFilter.class);
148148
final RecordFilter mockFilter2 = mock(RecordFilter.class);
149149

150-
when(mockFilter1.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
150+
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
151151
.thenReturn(true, false, true, true, true);
152-
when(mockFilter2.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
152+
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
153153
.thenReturn(true, true, false, true);
154154

155155
final RecordFilterDefinition recordFilterDefinition1 = new RecordFilterDefinition(mockFilter1, new HashMap<>());
@@ -182,9 +182,9 @@ public void testFilterMessages() {
182182

183183
// Verify mocks
184184
verify(mockFilter1, times(totalRecords))
185-
.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
185+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
186186
verify(mockFilter2, times(totalRecords - 1))
187-
.filter(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
187+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
188188
}
189189

190190
private ConsumerRecords createConsumerRecords(final int count) {

0 commit comments

Comments
 (0)