diff --git a/pom.xml b/pom.xml
index be4577f..2971466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.mousetech.gourmet
gourmetj
- 0.2.4
+ 0.2.5
jar
GourmetJ
diff --git a/src/main/java/com/mousetech/gourmetj/JSFUtils.java b/src/main/java/com/mousetech/gourmetj/JSFUtils.java
index d94e6dc..c2f4027 100644
--- a/src/main/java/com/mousetech/gourmetj/JSFUtils.java
+++ b/src/main/java/com/mousetech/gourmetj/JSFUtils.java
@@ -1,4 +1,4 @@
-package com.mousetech.gourmetj;
+ package com.mousetech.gourmetj;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java b/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
index cff8c68..a70b24a 100644
--- a/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
+++ b/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
-import com.mousetech.gourmetj.persistence.model.Category;
import com.mousetech.gourmetj.persistence.model.Recipe;
/**
@@ -24,7 +23,7 @@ import com.mousetech.gourmetj.persistence.model.Recipe;
public interface RecipeRepository
extends JpaRepository {
- List findByTitleContaining(String searchText);
+ List findByTitleContainingIgnoreCase(String searchText);
@EntityGraph(value="Recipe.findWorkingSet")
public Recipe findDetailsById(Long recipeId);
@@ -32,11 +31,11 @@ public interface RecipeRepository
@Query(name = "Recipe.findCusines", nativeQuery = true)
List FindCuisinesNative();
- List findByCategories_CategoryContains(String searchText);
+ List findByCategories_CategoryContainsIgnoreCase(String searchText);
- List findByCuisineContains(String searchText);
+ List findByCuisineContainsIgnoreCase(String searchText);
- List findDistinctByIngredientHash_ItemContains(
+ List findDistinctByIngredientHash_ItemContainsIgnoreCase(
String searchText);
}
diff --git a/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java b/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
index ce283c1..49bfcfa 100644
--- a/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
+++ b/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
@@ -50,7 +50,7 @@ public class RecipeService implements Serializable {
public List findByTitle(String searchText) {
return recipeRepository
- .findByTitleContaining(searchText);
+ .findByTitleContainingIgnoreCase(searchText);
}
public Recipe findByPrimaryKey(Long recipeId) {
@@ -120,14 +120,19 @@ public class RecipeService implements Serializable {
}
public List findByCategoryLike(String searchText) {
- return recipeRepository.findByCategories_CategoryContains(searchText);
+ return recipeRepository
+ .findByCategories_CategoryContainsIgnoreCase(
+ searchText);
}
public List findByCuisineLike(String searchText) {
- return recipeRepository.findByCuisineContains(searchText);
+ return recipeRepository
+ .findByCuisineContainsIgnoreCase(searchText);
}
public List findByIngredientLike(String searchText) {
- return recipeRepository.findDistinctByIngredientHash_ItemContains(searchText);
+ return recipeRepository
+ .findDistinctByIngredientHash_ItemContainsIgnoreCase(
+ searchText);
}
}
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index d16fe3b..21ad90e 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -62,9 +62,9 @@
+
@@ -372,6 +372,7 @@
>