CHE-4014; remove deprecated RemotePreferenceDao (#4455)

assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java

@@ -58,8 +58,6 @@ public class WsAgentModule extends AbstractModule {
     protected void configure() {
         bind(ApiInfoService.class);
 
-        bind(PreferenceDao.class).to(org.eclipse.che.RemotePreferenceDao.class);
-
         bind(OAuthTokenProvider.class).to(RemoteOAuthTokenProvider.class);
         bind(SshServiceClient.class).to(HttpSshServiceClient.class);
 

wsagent/che-core-api-git/pom.xml

@@ -78,10 +78,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-user</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-inject</artifactId>
@@ -117,6 +113,16 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-user</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-commons-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/GitModule.java

@@ -47,8 +47,6 @@ protected void configure() {
         bind(TagListWriter.class);
         bind(GitWebSocketMessenger.class);
 
-        //bind(GitConnectionFactory.class).to(NativeGitConnectionFactory.class);
-
         bind(GitCheckoutDetector.class).asEagerSingleton();
     }
 }

wsagent/che-core-api-git/src/main/java/org/eclipse/che/api/git/LocalGitUserResolver.java

@@ -10,15 +10,16 @@
  *******************************************************************************/
 package org.eclipse.che.api.git;
 
-import org.eclipse.che.api.core.ServerException;
+import org.eclipse.che.api.core.ApiException;
+import org.eclipse.che.api.core.rest.HttpJsonRequestFactory;
 import org.eclipse.che.api.git.shared.GitUser;
-import org.eclipse.che.api.user.server.spi.PreferenceDao;
-import org.eclipse.che.commons.env.EnvironmentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.inject.Singleton;
+import java.io.IOException;
 import java.util.Map;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -34,23 +35,28 @@ public class LocalGitUserResolver implements GitUserResolver {
 
     private static final Logger LOG = LoggerFactory.getLogger(LocalGitUserResolver.class);
 
-    private final PreferenceDao preferenceDao;
+    private final String                 apiUrl;
+    private final HttpJsonRequestFactory requestFactory;
 
     @Inject
-    public LocalGitUserResolver(PreferenceDao preferenceDao) {
-        this.preferenceDao = preferenceDao;
+    public LocalGitUserResolver(@Named("che.api") String apiUrl, HttpJsonRequestFactory requestFactory) {
+        this.apiUrl = apiUrl;
+        this.requestFactory = requestFactory;
     }
 
     @Override
     public GitUser getUser() {
         String name = null;
         String email = null;
         try {
-            Map<String, String> preferences = preferenceDao.getPreferences(EnvironmentContext.getCurrent().getSubject().getUserId(),
-                                                                           "git.committer.\\w+");
+            Map<String, String> preferences = requestFactory.fromUrl(apiUrl + "/preferences")
+                                                            .useGetMethod()
+                                                            .addQueryParam("filter", "git.committer.\\w+")
+                                                            .request()
+                                                            .asProperties();
             name = preferences.get("git.committer.name");
             email = preferences.get("git.committer.email");
-        } catch (ServerException e) {
+        } catch (ApiException | IOException e) {
             LOG.error(e.getLocalizedMessage(), e);
         }
         GitUser gitUser = newDto(GitUser.class);

wsagent/che-core-api-git/src/test/java/org/eclipse/che/api/git/LocalGitUserResolverTest.java

@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+/*******************************************************************************
+ + * Copyright (c) 2012-2017 Codenvy, S.A.
+ + * All rights reserved. This program and the accompanying materials
+ + * are made available under the terms of the Eclipse Public License v1.0
+ + * which accompanies this distribution, and is available at
+ + * http://www.eclipse.org/legal/epl-v10.html
+ + *
+ + * Contributors:
+ + *   Codenvy, S.A. - initial API and implementation
+ + *******************************************************************************/
+package org.eclipse.che.api.git;
+
+import org.eclipse.che.api.core.rest.HttpJsonRequest;
+import org.eclipse.che.api.core.rest.HttpJsonRequestFactory;
+import org.eclipse.che.api.core.rest.HttpJsonResponse;
+import org.eclipse.che.api.user.server.PreferencesService;
+import org.eclipse.che.commons.test.mockito.answer.SelfReturningAnswer;
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+
+import static javax.ws.rs.core.UriBuilder.fromUri;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link LocalGitUserResolver}
+ *
+ * @author  Max Shaposhnik
+ */
+
+@Listeners(MockitoTestNGListener.class)
+public class LocalGitUserResolverTest {
+
+    private final static String API_URL         = "apiUrl";
+    private final static String PREFECENCES_URL = "apiUrl/preferences";
+
+    @Mock
+    private HttpJsonRequestFactory requestFactory;
+    @Mock
+    private HttpJsonResponse       jsonResponse;
+
+    private HttpJsonRequest jsonRequest;
+
+    private LocalGitUserResolver resolver;
+
+    @BeforeMethod
+    public void setup() throws Exception {
+        jsonRequest = mock(HttpJsonRequest.class, new SelfReturningAnswer());
+        when(jsonRequest.request()).thenReturn(jsonResponse);
+        when(requestFactory.fromUrl(anyString())).thenReturn(jsonRequest);
+        resolver = new LocalGitUserResolver(API_URL, requestFactory);
+    }
+
+    @Test
+    public void shouldMakeGetPreferencesRequest() throws Exception {
+        //when
+        resolver.getUser();
+        //then
+        String url = fromUri(PREFECENCES_URL).path(PreferencesService.class, "find").build().toString();
+        verify(requestFactory).fromUrl(eq(url));
+        verify(jsonRequest).useGetMethod();
+        verify(jsonRequest).request();
+        verify(jsonResponse).asProperties();
+    }
+}

wsagent/che-core-git-impl-jgit/pom.xml

@@ -91,10 +91,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-shared</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-user</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>

wsagent/wsagent-local/pom.xml

@@ -48,18 +48,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-user</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.everrest</groupId>
-            <artifactId>everrest-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>