Fix codestyle

Author: AB-xdev

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

@@ -260,9 +260,9 @@ private void onOperatorChanged()
 
 				// Change to a text field if the field is of type enum with condition 'contains'
 				if(isSelSearchQueryVisible
-					&& this.selOperations.getValue()
-					.getDescription()
-					.equals(ContainsComparator.CONTAINS_COMPARATOR_DESCRIPTION))
+					&& ContainsComparator.CONTAINS_COMPARATOR_DESCRIPTION.equals(
+					this.selOperations.getValue()
+						.getDescription()))
 				{
 					this.selSearchQuery.setVisible(false);
 					this.txtSearchQuery.setVisible(true);
@@ -405,7 +405,7 @@ private void onAcceptFilter()
 
 		if(!this.identifier.isBlank())
 		{
-			if(this.editingBadgeId != null && !this.editingBadgeId.equals(NO_BADGE_ID_STRING))
+			if(this.editingBadgeId != null && !NO_BADGE_ID_STRING.equals(this.editingBadgeId))
 			{
 				badge.setBadgeId(this.editingBadgeId);
 				this.editingBadgeId = null;
@@ -447,7 +447,7 @@ private void onAcceptFilter()
 			badge.setBtnEditEnabled(true);
 			badge.addBtnEditClickListener(event ->
 			{
-				if((this.hlFilter.getChildren().findAny().isEmpty()))
+				if(this.hlFilter.getChildren().findAny().isEmpty())
 				{
 					// Add all components to the hlFilter layout
 					this.onShowFilterInput();
@@ -514,7 +514,7 @@ private void deactivateDeleteButtonFromChipComponents(
 
 				if(!this.identifier.isBlank()
 					&& badge.getBadgeId() != null
-					&& !badge.getBadgeId().equals(NO_BADGE_ID_STRING))
+					&& !NO_BADGE_ID_STRING.equals(badge.getBadgeId()))
 				{
 					badge.setBadgeId(DELETED_INITIAL_CONDITION_STRING);
 					this.addQueryParameter(badge);
@@ -550,7 +550,7 @@ private void formatLocalDateChipBadgeText(final ChipBadge<FilterCondition<T, ?>>
 		final FilterCondition<T, ?> filterField = chipBadge.getItem();
 
 		if(this.dateRangePickerQuery.isVisible()
-			&& filterField.getSelectedCondition().getDescription().equals(IS_BETWEEN_COMPARATOR_DESCRIPTION))
+			&& IS_BETWEEN_COMPARATOR_DESCRIPTION.equals(filterField.getSelectedCondition().getDescription()))
 		{
 			chipBadge.setItemLabelGenerator((ItemLabelGenerator<FilterCondition<T, ?>>)tFilterCondition ->
 			{
@@ -896,7 +896,7 @@ private void createConditionsFromQueryParameters()
 						&& i < this.queryBadgeDeletableList.size()
 						&& i < this.queryBadgeEditableList.size())
 					{
-						if(!this.queryBadgeIdList.get(i).equals(DELETED_INITIAL_CONDITION_STRING))
+						if(!DELETED_INITIAL_CONDITION_STRING.equals(this.queryBadgeIdList.get(i)))
 						{
 							final String badgeId = this.queryBadgeIdList.get(i);
 							CustomizationDegree customizationDegree = CustomizationDegree.EVERYTHING;
@@ -933,7 +933,7 @@ private void createConditionsFromQueryParameters()
 							{
 								// Check for same condition
 								final FilterCondition<T, ?> item = chipBadge.getItem();
-								if(!chipBadge.getBadgeId().equals(NO_BADGE_ID_STRING)
+								if(!NO_BADGE_ID_STRING.equals(chipBadge.getBadgeId())
 									&& this.queryInputFieldList.get(i).equals(item.getInputValue())
 									&& this.queryConditionFieldList.get(i)
 									.equals(item.getSelectedCondition().getDescription())
@@ -1216,7 +1216,13 @@ public void beforeEnter(final BeforeEnterEvent beforeEnterEvent)
 					.filter(i -> this.identifier.equals(idList.get(i)))
 					.toArray();
 
-				String componentId, field, condition, input, badgeId, editable, deletable;
+				String componentId;
+				String field;
+				String condition;
+				String input;
+				String badgeId;
+				String editable;
+				String deletable;
 
 				for(final int i : matchingIndices)
 				{

vaadin-simple-grid-filter/src/main/java/software/xdev/vaadin/comparators/utl/TypeHelper.java

@@ -46,7 +46,8 @@ public static boolean isDouble(final String str)
             return false;
         }
     }
-
+    
+    @SuppressWarnings("PMD.UselessOperationOnImmutable")
     public static boolean isLocalDate(final String str)
     {
         Objects.requireNonNull(str);
@@ -61,7 +62,8 @@ public static boolean isLocalDate(final String str)
             return false;
         }
     }
-
+    
+    @SuppressWarnings("PMD.UselessOperationOnImmutable")
     public static boolean isLocalDateTime(final String str)
     {
         Objects.requireNonNull(str);

vaadin-simple-grid-filter/src/main/java/software/xdev/vaadin/utl/QueryParameterUtil.java

@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.vaadin.flow.router.QueryParameters;
 
@@ -67,17 +68,19 @@ && isNotNullOrEmpty(inputList)
 			&& idList.size() == conditionList.size()
 			&& idList.size() == inputList.size())
 		{
+			final Set<String> parametersToCheck = Set.of(
+				QUERY_INPUT_STRING,
+				QUERY_COMPONENT_ID_STRING,
+				QUERY_FIELD_STRING,
+				QUERY_CONDITION_STRING,
+				QUERY_BADGE_ID_STRING,
+				QUERY_BADGE_EDITABLE_STRING,
+				QUERY_BADGE_DELETABLE_STRING);
 			for(final Map.Entry<String, List<String>> entry : parametersMap.entrySet())
 			{
 				// Conditions and fields cannot be null or empty
-				if(entry.getKey().equals(QUERY_INPUT_STRING)
-					|| ((entry.getKey().equals(QUERY_COMPONENT_ID_STRING)
-					|| entry.getKey().equals(QUERY_FIELD_STRING)
-					|| entry.getKey().equals(QUERY_CONDITION_STRING)
-					|| entry.getKey().equals(QUERY_BADGE_ID_STRING)
-					|| entry.getKey().equals(QUERY_BADGE_EDITABLE_STRING)
-					|| entry.getKey().equals(QUERY_BADGE_DELETABLE_STRING))
-					&& entry.getValue().stream().noneMatch(String::isBlank)))
+				if(parametersToCheck.contains(entry.getKey())
+					&& entry.getValue().stream().noneMatch(String::isBlank))
 				{
 					rightParameters = true;
 				}