Using DTOs in service and removing old value objects.

Graylog2 · Mar 26, 2015 · 8c51385 · 8c51385
1 parent 2086bfc
commit 8c51385
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 101 deletions.
diff --git a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/SessionService.java b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/SessionService.java
@@ -16,10 +16,10 @@
  */
 package org.graylog2.restclient.models;
 
+import org.graylog2.rest.models.system.sessions.requests.SessionCreateRequest;
+import org.graylog2.rest.models.system.sessions.responses.SessionResponse;
 import org.graylog2.restclient.lib.APIException;
 import org.graylog2.restclient.lib.ApiClient;
-import org.graylog2.restclient.models.api.requests.SessionCreateRequest;
-import org.graylog2.restclient.models.api.responses.SessionCreateResponse;
 import org.graylog2.restroutes.generated.routes;
 
 import javax.inject.Inject;
@@ -40,10 +40,10 @@ public SessionService(ApiClient apiClient) {
         this.apiClient = apiClient;
     }
 
-    public SessionCreateResponse create(String username, String password, String remoteAddress) throws APIException, IOException {
+    public SessionResponse create(String username, String password, String remoteAddress) throws APIException, IOException {
-        return apiClient.path(routes.SessionsResource().newSession(), SessionCreateResponse.class)
+        return apiClient.path(routes.SessionsResource().newSession(), SessionResponse.class)
                 .unauthenticated()
-                .body(new SessionCreateRequest(username, password, remoteAddress))
+                .body(SessionCreateRequest.create(username, password, remoteAddress))
                 .execute();
     }
 

diff --git a/...lient/src/main/java/org/graylog2/restclient/models/api/requests/SessionCreateRequest.java b/...lient/src/main/java/org/graylog2/restclient/models/api/requests/SessionCreateRequest.java
diff --git a/...ent/src/main/java/org/graylog2/restclient/models/api/responses/SessionCreateResponse.java b/...ent/src/main/java/org/graylog2/restclient/models/api/responses/SessionCreateResponse.java
diff --git a/...t/src/test/java/org/graylog2/restclient/models/api/requests/SessionCreateRequestTest.java b/...t/src/test/java/org/graylog2/restclient/models/api/requests/SessionCreateRequestTest.java