Remove ability to get users from batch

 + drop Hibernate model "User"

3 files changed, 3 insertions, 20 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java
index 15fce83fd9c..d5049fcfb15 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java
@@ -23,24 +23,13 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.database.BaseIdentifiable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 /**
  * @since 2.2
  */
-@Entity
-@Table(name = "users")
 public class User extends BaseIdentifiable {
 
-  @Column(name = "login", updatable = true, nullable = true, length = 255)
   private String login;
-
-  @Column(name = "name", updatable = true, nullable = true, length = 200)
   private String name;
-
-  @Column(name = "email", updatable = true, nullable = true, length = 100)
   private String email;
 
   public String getLogin() {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java
index 94c78120fb6..8e07887f421 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java
@@ -19,16 +19,14 @@
  */
 package org.sonar.api.security;
 
-import org.sonar.api.batch.BatchSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.api.database.model.User;
+import org.sonar.api.server.ServerSide;
 
 /**
  * @since 2.10
  * @deprecated since 5.1 DB access will soon be removed from batch side
  */
 @Deprecated
-@BatchSide
 @ServerSide
 public interface UserFinder {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java
index a73ff532466..8eed4f8da38 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java
@@ -19,19 +19,15 @@
  */
 package org.sonar.api.user;
 
-import org.sonar.api.batch.BatchSide;
-import org.sonar.api.server.ServerSide;
-
-import javax.annotation.CheckForNull;
-
 import java.util.List;
+import javax.annotation.CheckForNull;
+import org.sonar.api.server.ServerSide;
 
 /**
  * @since 3.6
  * @deprecated since 5.1 DB access will soon be removed from batch side
  */
 @Deprecated
-@BatchSide
 @ServerSide
 public interface UserFinder {