diff options
Diffstat (limited to 'sonar-db/src/main/java/org')
3 files changed, 18 insertions, 14 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentQuery.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentQuery.java index 58771e1e140..1d0f82addb8 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentQuery.java @@ -23,10 +23,10 @@ import java.util.Locale; import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.db.WildcardPosition; import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.db.DatabaseUtils.buildLikeValue; -import static org.sonar.db.WildcardPosition.AFTER; public class ComponentQuery { private final String nameOrKeyQuery; @@ -64,14 +64,12 @@ public class ComponentQuery { return nameOrKeyQuery; } + /** + * Used by MyBatis mapper + */ @CheckForNull - public String getNameOrKeyQueryToSqlForResourceIndex() { - return buildLikeValue(nameOrKeyQuery, AFTER).toLowerCase(Locale.ENGLISH); - } - - @CheckForNull - public String getNameOrKeyQueryToSqlForProjectKey() { - return buildLikeValue(nameOrKeyQuery, AFTER); + public String getNameOrKeyUpperLikeQuery() { + return buildLikeValue(nameOrKeyQuery, WildcardPosition.BEFORE_AND_AFTER).toUpperCase(Locale.ENGLISH); } @CheckForNull diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentTreeQuery.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentTreeQuery.java index 5405f9cb364..1e9a03a78a4 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentTreeQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentTreeQuery.java @@ -29,7 +29,7 @@ import org.sonar.db.WildcardPosition; import static com.google.common.collect.Lists.newArrayList; import static java.util.Objects.requireNonNull; import static org.sonar.db.DatabaseUtils.buildLikeValue; -import static org.sonar.db.WildcardPosition.AFTER; +import static org.sonar.db.WildcardPosition.BEFORE_AND_AFTER; public class ComponentTreeQuery { @@ -62,9 +62,12 @@ public class ComponentTreeQuery { return nameOrKeyQuery; } + /** + * Used by MyBatis mapper + */ @CheckForNull - public String getNameOrKeyQueryToSqlForResourceIndex() { - return nameOrKeyQuery == null ? null : buildLikeValue(nameOrKeyQuery, AFTER).toLowerCase(Locale.ENGLISH); + public String getNameOrKeyUpperLikeQuery() { + return nameOrKeyQuery == null ? null : buildLikeValue(nameOrKeyQuery, BEFORE_AND_AFTER).toUpperCase(Locale.ENGLISH); } public String getBaseUuid() { diff --git a/sonar-db/src/main/java/org/sonar/db/measure/MeasureTreeQuery.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureTreeQuery.java index 8ccd5a6a85d..19970bd24db 100644 --- a/sonar-db/src/main/java/org/sonar/db/measure/MeasureTreeQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureTreeQuery.java @@ -29,7 +29,7 @@ import org.sonar.db.component.ComponentDto; import static com.google.common.collect.Lists.newArrayList; import static java.util.Objects.requireNonNull; import static org.sonar.db.DatabaseUtils.buildLikeValue; -import static org.sonar.db.WildcardPosition.AFTER; +import static org.sonar.db.WildcardPosition.BEFORE_AND_AFTER; public class MeasureTreeQuery { @@ -63,9 +63,12 @@ public class MeasureTreeQuery { return nameOrKeyQuery; } + /** + * Used by MyBatis mapper + */ @CheckForNull - public String getNameOrKeyQueryToSqlForResourceIndex() { - return nameOrKeyQuery == null ? null : buildLikeValue(nameOrKeyQuery, AFTER).toLowerCase(Locale.ENGLISH); + public String getNameOrKeyUpperLikeQuery() { + return nameOrKeyQuery == null ? null : buildLikeValue(nameOrKeyQuery, BEFORE_AND_AFTER).toUpperCase(Locale.ENGLISH); } @CheckForNull |