more (more, more) missing package/class renamings #1186

Graylog2 · Mar 28, 2015 · 85c8318 · 85c8318
1 parent 3dca666
commit 85c8318
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/AlarmCallbacksController.java b/app/controllers/AlarmCallbacksController.java
@@ -4,7 +4,7 @@
 import org.graylog2.restclient.lib.APIException;
 import org.graylog2.restclient.models.AlarmCallbackService;
 import org.graylog2.restclient.models.api.requests.alarmcallbacks.CreateAlarmCallbackRequest;
-import org.graylog2.restclient.models.api.responses.alarmcallbacks.GetSingleAvailableAlarmCallbackResponse;
+import org.graylog2.rest.models.alarmcallbacks.responses.AvailableAlarmCallbackSummaryResponse;
 import play.data.Form;
 import play.mvc.Result;
 
@@ -28,7 +28,7 @@ public Result create(String streamId) throws IOException, APIException {
         Form<CreateAlarmCallbackRequest> boundForm = alarmCallbackForm.bindFromRequest();
         CreateAlarmCallbackRequest request = boundForm.get();
 
-        Map<String, GetSingleAvailableAlarmCallbackResponse> availableAlarmCallbacks = alarmCallbackService.available(streamId);
+        Map<String, AvailableAlarmCallbackSummaryResponse> availableAlarmCallbacks = alarmCallbackService.available(streamId);
 
         request.configuration = extractConfiguration(request.configuration, availableAlarmCallbacks.get(request.type));
 
@@ -43,7 +43,7 @@ public Result delete(String streamId, String alarmCallbackId) throws IOException
         return redirect(routes.AlertsController.index(streamId));
     }
 
-    protected Map<String, Object> extractConfiguration(Map<String, Object> form, GetSingleAvailableAlarmCallbackResponse alarmCallbackInfo) {
+    protected Map<String, Object> extractConfiguration(Map<String, Object> form, AvailableAlarmCallbackSummaryResponse alarmCallbackInfo) {
         Map<String, Object> configuration = Maps.newHashMap();
         for (Map.Entry<String, Object> entry : form.entrySet()) {
             Object value;

diff --git a/app/controllers/AlertsController.java b/app/controllers/AlertsController.java
@@ -27,7 +27,7 @@
 import org.graylog2.restclient.models.alerts.AlertCondition;
 import org.graylog2.restclient.models.alerts.AlertConditionService;
 import org.graylog2.restclient.models.api.requests.alerts.CreateAlertConditionRequest;
-import org.graylog2.restclient.models.api.responses.alarmcallbacks.GetSingleAvailableAlarmCallbackResponse;
+import org.graylog2.rest.models.alarmcallbacks.responses.AvailableAlarmCallbackSummaryResponse;
 import play.mvc.BodyParser;
 import play.mvc.Result;
 
@@ -76,7 +76,7 @@ public Result index(String streamId) {
             }
             users.append("]");
 
-            Map<String, GetSingleAvailableAlarmCallbackResponse> availableAlarmCallbacks = alarmCallbackService.available(streamId);
+            Map<String, AvailableAlarmCallbackSummaryResponse> availableAlarmCallbacks = alarmCallbackService.available(streamId);
             List<AlarmCallback> alarmCallbacks = alarmCallbackService.all(streamId);
 
             return ok(views.html.alerts.manage.render(

diff --git a/app/controllers/ExtractorsController.java b/app/controllers/ExtractorsController.java
@@ -33,7 +33,7 @@
 import org.graylog2.restclient.models.MessagesService;
 import org.graylog2.restclient.models.Node;
 import org.graylog2.restclient.models.NodeService;
-import org.graylog2.restclient.models.api.requests.CreateExtractorRequest;
+import org.graylog2.rest.models.system.inputs.extractors.requests.CreateExtractorRequest;
 import org.graylog2.restclient.models.api.requests.ExtractorImportRequest;
 import org.graylog2.restclient.models.api.requests.ExtractorListImportRequest;
 import org.graylog2.restclient.models.api.results.MessageResult;