From 7b8464adf1bc41765efe1f582e7fef3ee7d9af48 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 1 Oct 2014 12:32:26 +0200
Subject: SONAR-5529 Move IssueQuery from api to server

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
---
 sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java          | 2 +-
 sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java       | 2 +-
 sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsDao.java     | 2 +-
 sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsMapper.java  | 2 +-
 sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java      | 2 +-
 sonar-core/src/test/java/org/sonar/core/issue/db/IssueStatsDaoTest.java | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sonar-core')

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java
index 9c876b02874..7b762252028 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java
@@ -26,10 +26,10 @@ import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.api.issue.IssueQuery;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.rule.RuleDto;
+import org.sonar.server.issue.IssueQuery;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
index 578df00d41d..eb7c783ea2c 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
@@ -20,8 +20,8 @@
 package org.sonar.core.issue.db;
 
 import org.apache.ibatis.annotations.Param;
-import org.sonar.api.issue.IssueQuery;
 import org.sonar.core.rule.RuleDto;
+import org.sonar.server.issue.IssueQuery;
 
 import javax.annotation.Nullable;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsDao.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsDao.java
index fc5769903e2..81db0758bf7 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsDao.java
@@ -22,8 +22,8 @@ package org.sonar.core.issue.db;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.ServerComponent;
-import org.sonar.api.issue.IssueQuery;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.server.issue.IssueQuery;
 
 import javax.annotation.Nullable;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsMapper.java
index 68d742feab8..14bdfc99604 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStatsMapper.java
@@ -21,7 +21,7 @@
 package org.sonar.core.issue.db;
 
 import org.apache.ibatis.annotations.Param;
-import org.sonar.api.issue.IssueQuery;
+import org.sonar.server.issue.IssueQuery;
 
 import javax.annotation.Nullable;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index 5157ab9319a..ad0418bbecf 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -26,12 +26,12 @@ import org.apache.ibatis.executor.result.DefaultResultHandler;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.api.issue.IssueQuery;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.core.persistence.AbstractDaoTestCase;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.server.issue.IssueQuery;
 
 import java.util.List;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStatsDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStatsDaoTest.java
index 229e41af01b..304185d13e1 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStatsDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStatsDaoTest.java
@@ -22,8 +22,8 @@ package org.sonar.core.issue.db;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.api.issue.IssueQuery;
 import org.sonar.core.persistence.AbstractDaoTestCase;
+import org.sonar.server.issue.IssueQuery;
 
 import java.util.List;
 
-- 
cgit v1.2.3