Skip to content

Commit 7884306

Browse files
AB-xdevAB-xdev
committed
Cleanup
* Format * Remove self explaining comments * Remove logging - not needed on UI * Fix typos * Remove java serialization support
1 parent 54e66c9 commit 7884306

23 files changed

+625
-894
lines changed

‎vaadin-grid-filter/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@
104104
<groupId>com.vaadin</groupId>
105105
<artifactId>vaadin-core</artifactId>
106106
</dependency>
107+
<dependency>
108+
<groupId>software.xdev</groupId>
109+
<artifactId>vaadin-date-range-picker</artifactId>
110+
<version>4.1.1</version>
111+
</dependency>
107112
</dependencies>
108113

109114
<build>

‎vaadin-grid-filter/src/main/java/software/xdev/vaadin/FilterComponent.java

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
import java.util.stream.IntStream;
4848
import java.util.stream.Stream;
4949

50-
import org.apache.logging.log4j.LogManager;
51-
import org.apache.logging.log4j.Logger;
52-
5350
import com.vaadin.flow.component.Composite;
5451
import com.vaadin.flow.component.ItemLabelGenerator;
5552
import com.vaadin.flow.component.Key;
@@ -91,8 +88,6 @@
9188
*/
9289
public class FilterComponent<T> extends Composite<VerticalLayout> implements BeforeEnterObserver
9390
{
94-
private static final Logger LOGGER = LogManager.getLogger(FilterComponent.class);
95-
9691
public static final String CHIP_BADGE_FILTER_COMPONENT = "chipFilterComponent";
9792
public static final String BTN_ACCEPT_FILTER_FILTER_COMPONENT = "btnAcceptFilterFilterComponent";
9893
public static final String TXT_SEARCH_QUERY_FILTER_COMPONENT = "txtSearchQueryFilterComponent";
@@ -227,8 +222,6 @@ private void onOperatorChanged()
227222
{
228223
this.selSearchQuery.setVisible(false);
229224
this.txtSearchQuery.setVisible(true);
230-
231-
LOGGER.debug("Switched to input field to text field.");
232225
}
233226
else if(!isSelSearchQueryVisible)
234227
{
@@ -245,7 +238,6 @@ else if(this.selFields.getValue() != null && this.selFields.getValue().getType()
245238
this.dateRangePickerQuery.setVisible(true);
246239
this.dateSearchQuery.setVisible(false);
247240

248-
LOGGER.debug("Switched input field to date range picker.");
249241
// Validating if the accept filter button should be activated because the date range picker
250242
// has already a value by default
251243
this.btnAcceptFilter.setEnabled(this.shouldTheAcceptButtonBeEnabled());
@@ -257,8 +249,6 @@ else if(this.selOperations.getValue() != null)
257249
}
258250
}
259251
}
260-
261-
LOGGER.debug("Operator changed.");
262252
}
263253

264254
private void onShowFilterInput()
@@ -293,8 +283,6 @@ private void onShowFilterInput()
293283
this.btnCancelFilter,
294284
this.btnAcceptFilter
295285
);
296-
297-
LOGGER.debug("Showing available filters.");
298286
}
299287
}
300288

@@ -303,7 +291,6 @@ private void onShowFilterInput()
303291
*/
304292
private void onAcceptFilter()
305293
{
306-
LOGGER.debug("Filter accepted.");
307294
final String userInput = this.getValueFromVisibleComponent();
308295

309296
final ChipBadgeExtension<FilterCondition<T, ?>> badge;
@@ -400,7 +387,6 @@ private void onAcceptFilter()
400387

401388
// Remove filter, update grid
402389
this.removeChipBadgeCondition(badge);
403-
LOGGER.debug("Editing filter now...");
404390
}
405391
});
406392
}
@@ -439,8 +425,6 @@ private void deactivateDeleteButtonFromChipComponents(
439425
badge.setBadgeId(DELETED_INITIAL_CONDITION_STRING);
440426
this.addQueryParameter(badge);
441427
}
442-
443-
LOGGER.debug("Filter removed.");
444428
});
445429
}
446430
}
@@ -467,7 +451,6 @@ private void formatLocalDateChipBadgeText(final ChipBadge<FilterCondition<T, ?>>
467451
}
468452
catch(final DateTimeParseException e)
469453
{
470-
LOGGER.error("Error parsing local date range into chipBadge component text.", e);
471454
startDate = LocalDate.MIN;
472455
endDate = LocalDate.MAX;
473456
}
@@ -488,8 +471,6 @@ private void formatLocalDateChipBadgeText(final ChipBadge<FilterCondition<T, ?>>
488471
dateString = startDate + " and " + endDate;
489472
}
490473

491-
LOGGER.debug("Formatted date range query string to {}.", dateString);
492-
493474
return createChipComponentString(tFilterCondition, dateString);
494475
});
495476
}
@@ -505,7 +486,6 @@ else if(this.dateSearchQuery.isVisible())
505486
}
506487
catch(final DateTimeParseException e)
507488
{
508-
LOGGER.error("Error parsing local date into chipBadge component text.", e);
509489
localDate = LocalDate.MIN;
510490
}
511491

@@ -521,8 +501,6 @@ else if(this.dateSearchQuery.isVisible())
521501
dateString = localDate.toString();
522502
}
523503

524-
LOGGER.debug("Formatted date query string to {}.", dateString);
525-
526504
return createChipComponentString(tFilterCondition, dateString);
527505
});
528506
}
@@ -540,7 +518,6 @@ else if(this.dateTimeSearchQuery.isVisible())
540518
}
541519
catch(final DateTimeParseException e)
542520
{
543-
LOGGER.error("Error parsing local date or local date time into chipBadge component text.", e);
544521
localDateTime = LocalDateTime.MIN;
545522
localDate = LocalDate.MIN;
546523
}
@@ -565,8 +542,6 @@ else if(this.dateTimeSearchQuery.isVisible())
565542

566543
dateString += " " + localDateTime.toLocalTime();
567544

568-
LOGGER.debug("Formatted date time search query string to {}.", dateString);
569-
570545
return createChipComponentString(tFilterCondition, dateString);
571546
}
572547
);
@@ -589,8 +564,6 @@ private static <T> String createChipComponentString(
589564
*/
590565
private String getValueFromVisibleComponent()
591566
{
592-
LOGGER.debug("Getting value from visible component.");
593-
594567
if(this.nmbSearchQuery.isVisible())
595568
{
596569
return this.nmbSearchQuery.getValue().toString();
@@ -707,22 +680,12 @@ private void onFieldChange(final FilterField<T, ?> filterField)
707680
if(filterField instanceof FilterFieldEnumExtension)
708681
{
709682
this.setEnumSelectValues(this.selFields.getValue());
710-
711-
LOGGER.debug("Set the values for the enum selection.");
712683
}
713684
else if(filterField.getType() == Boolean.class)
714685
{
715686
this.selSearchQuery.setItems(new ArrayList<>(Arrays.asList("true", "false")));
716-
717-
LOGGER.debug("Set the values for the boolean selection.");
718-
}
719-
else
720-
{
721-
LOGGER.debug("Filter field is not an instance of FilterFieldTypeExtension or a type of boolean.");
722687
}
723688
}
724-
725-
LOGGER.debug("Field changed.");
726689
}
727690

728691
private void setInputComponentVisibility(final Class<?> type)
@@ -754,14 +717,10 @@ else if(type.isAssignableFrom(Enum.class) || type.isAssignableFrom(Boolean.class
754717
{
755718
this.txtSearchQuery.setVisible(true);
756719
}
757-
758-
LOGGER.debug("The visibility for the input component was set.");
759720
}
760721

761722
private void updateGridFilter()
762723
{
763-
LOGGER.debug("Updating grid filter.");
764-
765724
if(this.chipBadges.isEmpty())
766725
{
767726
this.dataGrid.getListDataView().removeFilters();

‎vaadin-grid-filter/src/main/java/software/xdev/vaadin/builder/CustomizableFilterBuilder.java

Lines changed: 65 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -15,138 +15,81 @@
1515
*/
1616
package software.xdev.vaadin.builder;
1717

18+
import java.time.LocalDate;
19+
import java.time.LocalDateTime;
20+
import java.util.ArrayList;
21+
import java.util.Objects;
22+
1823
import com.vaadin.flow.function.ValueProvider;
24+
1925
import software.xdev.vaadin.model.FilterField;
2026
import software.xdev.vaadin.model.FilterFieldEnumExtension;
2127
import software.xdev.vaadin.model.FilterProvider;
2228

23-
import java.time.LocalDate;
24-
import java.time.LocalDateTime;
25-
import java.util.ArrayList;
26-
import java.util.Objects;
2729

2830
/**
2931
* Used to create a customizable FilterField.
3032
*
3133
* @see FilterField
3234
*/
33-
public final class CustomizableFilterBuilder
35+
public class CustomizableFilterBuilder
3436
{
35-
private CustomizableFilterBuilder()
36-
{
37-
}
38-
39-
public static CustomizableFilterBuilder builder()
40-
{
41-
return new CustomizableFilterBuilder();
42-
}
43-
44-
45-
/**
46-
* Is used to create a new field for filtering.
47-
*
48-
* @param provider The field of the bean with type String.
49-
* @param description Is used to set the description of the selectable field.
50-
* @param <T> Type of the field.
51-
* @return Returns a field for filtering.
52-
*/
53-
public <T> FilterField<T, String> withValueProvider(final FilterProvider.StringProvider<T> provider,
54-
final String description)
55-
{
56-
return this.withValueProvider(provider, description, String.class);
57-
}
58-
59-
/**
60-
* Is used to create a new field for filtering.
61-
*
62-
* @param provider The field of the bean with type Number.
63-
* @param description Is used to set the description of the selectable field.
64-
* @param <T> Type of the field.
65-
* @return Returns a field for filtering.
66-
*/
67-
public <T> FilterField<T, Number> withValueProvider(final FilterProvider.NumberProvider<T> provider,
68-
final String description)
69-
{
70-
return this.withValueProvider(provider, description, Number.class);
71-
}
72-
73-
/**
74-
* Is used to create a new field for filtering.
75-
*
76-
* @param provider The field of the bean with type LocalDate.
77-
* @param description Is used to set the description of the selectable field.
78-
* @param <T> Type of the field.
79-
* @return Returns a field for filtering.
80-
*/
81-
public <T> FilterField<T, LocalDate> withValueProvider(
82-
final FilterProvider.LocalDateProvider<T> provider,
83-
final String description)
84-
{
85-
return this.withValueProvider(provider, description, LocalDate.class);
86-
}
87-
88-
/**
89-
* Is used to create a new field for filtering.
90-
*
91-
* @param provider The field of the bean with type LocalDateTime.
92-
* @param description Is used to set the description of the selectable field.
93-
* @param <T> Type of the field.
94-
* @return Returns a field for filtering.
95-
*/
96-
public <T> FilterField<T, LocalDateTime> withValueProvider(
97-
final FilterProvider.LocalDateTimeProvider<T> provider,
98-
final String description)
99-
{
100-
return this.withValueProvider(provider, description, LocalDateTime.class);
101-
}
102-
103-
/**
104-
* Is used to create a new field for filtering.
105-
*
106-
* @param provider The field of the bean with type Boolean.
107-
* @param description Is used to set the description of the selectable field.
108-
* @param <T> Type of the field.
109-
* @return Returns a field for filtering.
110-
*/
111-
public <T> FilterField<T, Boolean> withValueProvider(
112-
final FilterProvider.BooleanProvider<T> provider,
113-
final String description)
114-
{
115-
return this.withValueProvider(provider, description, Boolean.class);
116-
}
117-
118-
/**
119-
* Is used to create a new field for filtering.
120-
*
121-
* @param provider The field of the bean with type Enum.
122-
* @param description Is used to set the description of the selectable field.
123-
* @param <T> Type of the field.
124-
* @return Returns a field for filtering.
125-
*/
126-
public <T> FilterField<T, Enum> withValueProvider(final FilterProvider.EnumProvider<T> provider,
127-
final String description,
128-
final Enum<?>[] enumValues)
129-
{
130-
return new FilterFieldEnumExtension<>(provider, description, Enum.class, new ArrayList<>(), enumValues);
131-
}
132-
133-
/**
134-
* Is used to create a new field for filtering.
135-
*
136-
* @param provider The field of the bean.
137-
* @param description The name of the selectable field.
138-
* @param type The class of the field.
139-
* @param <T> The bean.
140-
* @param <X> The type of the field.
141-
* @return Returns a new filterField.
142-
*/
143-
public <T, X> FilterField<T, X> withValueProvider(final ValueProvider<T, X> provider,
144-
final String description,
145-
final Class<X> type)
146-
{
147-
Objects.requireNonNull(provider);
148-
Objects.requireNonNull(description);
149-
150-
return new FilterField<>(provider, description, type, new ArrayList<>());
151-
}
37+
public static CustomizableFilterBuilder builder()
38+
{
39+
return new CustomizableFilterBuilder();
40+
}
41+
42+
public <T> FilterField<T, String> withValueProvider(
43+
final FilterProvider.StringProvider<T> provider,
44+
final String description)
45+
{
46+
return this.withValueProvider(provider, description, String.class);
47+
}
48+
49+
public <T> FilterField<T, Number> withValueProvider(
50+
final FilterProvider.NumberProvider<T> provider,
51+
final String description)
52+
{
53+
return this.withValueProvider(provider, description, Number.class);
54+
}
55+
56+
public <T> FilterField<T, LocalDate> withValueProvider(
57+
final FilterProvider.LocalDateProvider<T> provider,
58+
final String description)
59+
{
60+
return this.withValueProvider(provider, description, LocalDate.class);
61+
}
62+
63+
public <T> FilterField<T, LocalDateTime> withValueProvider(
64+
final FilterProvider.LocalDateTimeProvider<T> provider,
65+
final String description)
66+
{
67+
return this.withValueProvider(provider, description, LocalDateTime.class);
68+
}
69+
70+
public <T> FilterField<T, Boolean> withValueProvider(
71+
final FilterProvider.BooleanProvider<T> provider,
72+
final String description)
73+
{
74+
return this.withValueProvider(provider, description, Boolean.class);
75+
}
76+
77+
public <T> FilterField<T, Enum> withValueProvider(
78+
final FilterProvider.EnumProvider<T> provider,
79+
final String description,
80+
final Enum<?>[] enumValues)
81+
{
82+
return new FilterFieldEnumExtension<>(provider, description, Enum.class, new ArrayList<>(), enumValues);
83+
}
84+
85+
public <T, X> FilterField<T, X> withValueProvider(
86+
final ValueProvider<T, X> provider,
87+
final String description,
88+
final Class<X> type)
89+
{
90+
Objects.requireNonNull(provider);
91+
Objects.requireNonNull(description);
92+
93+
return new FilterField<>(provider, description, type, new ArrayList<>());
94+
}
15295
}

0 commit comments

Comments
 (0)