aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-db-dao/src/main
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2017-10-30 17:22:53 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2017-11-01 14:40:29 +0100
commit49c5faaf21fb8a0d44ecece526f655aae14727c6 (patch)
tree1142d9865f921b0b37fe49ed0fd015b0a8fd4143 /server/sonar-db-dao/src/main
parentd0efb4c3a0b9161df8290a993145827637320eba (diff)
downloadsonarqube-49c5faaf21fb8a0d44ecece526f655aae14727c6.tar.gz
sonarqube-49c5faaf21fb8a0d44ecece526f655aae14727c6.zip
SONAR-9863 Do not return licenses hashed in api/settings/value
Diffstat (limited to 'server/sonar-db-dao/src/main')
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/property/PropertiesDao.java6
-rw-r--r--server/sonar-db-dao/src/main/resources/org/sonar/db/property/PropertiesMapper.xml11
2 files changed, 0 insertions, 17 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/property/PropertiesDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/property/PropertiesDao.java
index 46b1d3b4a7c..70545bfe881 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/property/PropertiesDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/property/PropertiesDao.java
@@ -36,11 +36,9 @@ import org.sonar.api.web.UserRole;
import org.sonar.db.Dao;
import org.sonar.db.DbSession;
import org.sonar.db.MyBatis;
-import org.sonar.db.WildcardPosition;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.commons.lang.StringUtils.repeat;
-import static org.sonar.db.DaoDatabaseUtils.buildLikeValue;
import static org.sonar.db.DatabaseUtils.executeLargeInputs;
import static org.sonar.db.DatabaseUtils.executeLargeInputsWithoutOutput;
@@ -163,10 +161,6 @@ public class PropertiesDao implements Dao {
return executeLargeInputs(componentIds, getMapper(session)::selectByComponentIds);
}
- public List<PropertyDto> selectGlobalPropertiesByKeyQuery(DbSession session, String keyQuery) {
- return getMapper(session).selectGlobalPropertiesByKeyQuery(buildLikeValue(keyQuery, WildcardPosition.BEFORE_AND_AFTER));
- }
-
/**
* Saves the specified property and its value.
* <p>
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/property/PropertiesMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
index f5571ebe90f..eb6f2943942 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
@@ -157,17 +157,6 @@
</where>
</select>
- <select id="selectGlobalPropertiesByKeyQuery" resultType="ScrapProperty">
- select
- <include refid="columnsToScrapPropertyDto"/>
- from
- properties p
- where
- p.resource_id is null
- and p.user_id is null
- and p.prop_key like #{textQuery,jdbcType=VARCHAR}
- </select>
-
<select id="selectIdsByOrganizationAndUser" parameterType="map" resultType="long">
select py.id
from properties py