Field Content Value rebranding

Graylog2 · May 27, 2015 · 12bfc0c · 12bfc0c
1 parent 484aca4
commit 12bfc0c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 34 deletions.
diff --git a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/alerts/AlertCondition.java b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/alerts/AlertCondition.java
@@ -26,19 +26,16 @@
 import java.text.DecimalFormat;
 import java.util.Map;
 
-/**
- * @author Lennart Koopmann <lennart@torch.sh>
- */
 public class AlertCondition {
 
     public interface Factory {
-        public AlertCondition fromSummaryResponse(AlertConditionSummaryResponse acsr);
+        AlertCondition fromSummaryResponse(AlertConditionSummaryResponse acsr);
     }
 
     public enum Type {
         MESSAGE_COUNT,
         FIELD_VALUE,
-        FIELD_STRING_VALUE
+        FIELD_CONTENT_VALUE
     }
 
     private final String id;
@@ -88,8 +85,8 @@ public String getSummary() {
                 return "Message count condition";
             case FIELD_VALUE:
                 return "Field value condition";
-            case FIELD_STRING_VALUE:
+            case FIELD_CONTENT_VALUE:
-                return "Field string value condition";
+                return "Field content value condition";
         }
 
         throw new RuntimeException("Cannot build summary for unknown alert condition type [" + type + "]");
@@ -109,8 +106,8 @@ public String getDescription() {
             case FIELD_VALUE:
                 sb.append(buildFieldValueDescription());
                 break;
-            case FIELD_STRING_VALUE:
+            case FIELD_CONTENT_VALUE:
-                sb.append(buildFieldStringValueDescription());
+                sb.append(buildFieldContentValueDescription());
                 break;
             default:
                 throw new RuntimeException("Cannot build description for unknown alert condition type [" + type + "]");
@@ -122,7 +119,7 @@ public String getDescription() {
         return sb.toString();
     }
 
-    private String buildFieldStringValueDescription() {
+    private String buildFieldContentValueDescription() {
         String query = String.valueOf(parameters.get("field")) + ":\"" + parameters.get("value") + "\"";
 
         return "Alert is triggered when messages matching <" + query + "> are received. ";

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AbstractAlertCondition.java b/graylog2-server/src/main/java/org/graylog2/alerts/AbstractAlertCondition.java
@@ -36,7 +36,7 @@ public abstract class AbstractAlertCondition implements EmbeddedPersistable, Ale
     public enum Type {
         MESSAGE_COUNT,
         FIELD_VALUE,
-        FIELD_STRING_VALUE,
+        FIELD_CONTENT_VALUE,
         DUMMY
     }
 

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AlertServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/alerts/AlertServiceImpl.java
@@ -23,7 +23,7 @@
 import com.mongodb.DBObject;
 import com.mongodb.QueryBuilder;
 import org.bson.types.ObjectId;
-import org.graylog2.alerts.types.FieldStringValueAlertCondition;
+import org.graylog2.alerts.types.FieldContentValueAlertCondition;
 import org.graylog2.alerts.types.FieldValueAlertCondition;
 import org.graylog2.alerts.types.MessageCountAlertCondition;
 import org.graylog2.database.MongoConnection;
@@ -47,17 +47,17 @@ public class AlertServiceImpl extends PersistedServiceImpl implements AlertServi
 
     private final FieldValueAlertCondition.Factory fieldValueAlertFactory;
     private final MessageCountAlertCondition.Factory messageCountAlertFactory;
-    private final FieldStringValueAlertCondition.Factory fieldStringValueAlertFactory;
+    private final FieldContentValueAlertCondition.Factory fieldContentValueAlertFactory;
 
     @Inject
     public AlertServiceImpl(MongoConnection mongoConnection,
                             FieldValueAlertCondition.Factory fieldValueAlertFactory,
                             MessageCountAlertCondition.Factory messageCountAlertFactory,
-                            FieldStringValueAlertCondition.Factory fieldStringValueAlertFactory) {
+                            FieldContentValueAlertCondition.Factory fieldContentValueAlertFactory) {
         super(mongoConnection);
         this.fieldValueAlertFactory = fieldValueAlertFactory;
         this.messageCountAlertFactory = messageCountAlertFactory;
-        this.fieldStringValueAlertFactory = fieldStringValueAlertFactory;
+        this.fieldContentValueAlertFactory = fieldContentValueAlertFactory;
     }
 
     @Override
@@ -153,8 +153,8 @@ private AbstractAlertCondition createAlertCondition(AbstractAlertCondition.Type
                 return messageCountAlertFactory.createAlertCondition(stream, id, createdAt, creatorId, parameters);
             case FIELD_VALUE:
                 return fieldValueAlertFactory.createAlertCondition(stream, id, createdAt, creatorId, parameters);
-            case FIELD_STRING_VALUE:
+            case FIELD_CONTENT_VALUE:
-                return fieldStringValueAlertFactory.createAlertCondition(stream, id, createdAt, creatorId, parameters);
+                return fieldContentValueAlertFactory.createAlertCondition(stream, id, createdAt, creatorId, parameters);
         }
 
         throw new AbstractAlertCondition.NoSuchAlertConditionTypeException("Unhandled alert condition type: " + type);

diff --git a/...types/FieldStringValueAlertCondition.java → ...ypes/FieldContentValueAlertCondition.java b/...types/FieldStringValueAlertCondition.java → ...ypes/FieldContentValueAlertCondition.java
@@ -41,21 +41,21 @@
 import java.util.List;
 import java.util.Map;
 
-public class FieldStringValueAlertCondition extends AbstractAlertCondition {
+public class FieldContentValueAlertCondition extends AbstractAlertCondition {
-    private static final Logger LOG = LoggerFactory.getLogger(FieldStringValueAlertCondition.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FieldContentValueAlertCondition.class);
 
     private final Searches searches;
     private final Configuration configuration;
     private final String field;
     private final String value;
 
     public interface Factory {
-        FieldStringValueAlertCondition createAlertCondition(Stream stream, String id, DateTime createdAt, @Assisted("userid") String creatorUserId, Map<String, Object> parameters);
+        FieldContentValueAlertCondition createAlertCondition(Stream stream, String id, DateTime createdAt, @Assisted("userid") String creatorUserId, Map<String, Object> parameters);
     }
 
     @AssistedInject
-    public FieldStringValueAlertCondition(Searches searches, Configuration configuration, @Assisted Stream stream, @Nullable @Assisted String id, @Assisted DateTime createdAt, @Assisted("userid") String creatorUserId, @Assisted Map<String, Object> parameters) {
+    public FieldContentValueAlertCondition(Searches searches, Configuration configuration, @Assisted Stream stream, @Nullable @Assisted String id, @Assisted DateTime createdAt, @Assisted("userid") String creatorUserId, @Assisted Map<String, Object> parameters) {
-        super(stream, id, Type.FIELD_STRING_VALUE, createdAt, creatorUserId, parameters);
+        super(stream, id, Type.FIELD_CONTENT_VALUE, createdAt, creatorUserId, parameters);
         this.searches = searches;
         this.configuration = configuration;
         this.field = (String) parameters.get("field");

diff --git a/graylog2-server/src/main/java/org/graylog2/bindings/ServerBindings.java b/graylog2-server/src/main/java/org/graylog2/bindings/ServerBindings.java
@@ -28,7 +28,7 @@
 import org.graylog2.Configuration;
 import org.graylog2.alerts.AlertSender;
 import org.graylog2.alerts.FormattedEmailAlertSender;
-import org.graylog2.alerts.types.FieldStringValueAlertCondition;
+import org.graylog2.alerts.types.FieldContentValueAlertCondition;
 import org.graylog2.alerts.types.FieldValueAlertCondition;
 import org.graylog2.alerts.types.MessageCountAlertCondition;
 import org.graylog2.bindings.providers.BundleExporterProvider;
@@ -139,7 +139,7 @@ private void bindFactoryModules() {
         install(new FactoryModuleBuilder().build(LdapSettingsImpl.Factory.class));
         install(new FactoryModuleBuilder().build(FieldValueAlertCondition.Factory.class));
         install(new FactoryModuleBuilder().build(MessageCountAlertCondition.Factory.class));
-        install(new FactoryModuleBuilder().build(FieldStringValueAlertCondition.Factory.class));
+        install(new FactoryModuleBuilder().build(FieldContentValueAlertCondition.Factory.class));
         install(new FactoryModuleBuilder().build(WidgetCacheTime.Factory.class));
     }
 

diff --git a/graylog2-server/src/test/java/org/graylog2/alerts/AlertConditionTest.java b/graylog2-server/src/test/java/org/graylog2/alerts/AlertConditionTest.java
@@ -18,7 +18,7 @@
 
 import com.google.common.collect.Maps;
 import com.google.inject.assistedinject.Assisted;
-import org.graylog2.alerts.types.FieldStringValueAlertCondition;
+import org.graylog2.alerts.types.FieldContentValueAlertCondition;
 import org.graylog2.alerts.types.FieldValueAlertCondition;
 import org.graylog2.alerts.types.MessageCountAlertCondition;
 import org.graylog2.database.MongoConnection;
@@ -84,14 +84,14 @@ public MessageCountAlertCondition createAlertCondition(Stream stream,
                         return new MessageCountAlertCondition(searches, stream, id, createdAt, creatorUserId, parameters);
                     }
                 },
-                new FieldStringValueAlertCondition.Factory() {
+                new FieldContentValueAlertCondition.Factory() {
                     @Override
-                    public FieldStringValueAlertCondition createAlertCondition(Stream stream,
+                    public FieldContentValueAlertCondition createAlertCondition(Stream stream,
                                                                            String id,
                                                                            DateTime createdAt,
                                                                            @Assisted("userid") String creatorUserId,
                                                                            Map<String, Object> parameters) {
-                        return new FieldStringValueAlertCondition(searches, null, stream, id, createdAt, creatorUserId, parameters);
+                        return new FieldContentValueAlertCondition(searches, null, stream, id, createdAt, creatorUserId, parameters);
                     }
                 }));
 

diff --git a/...s/FieldStringValueAlertConditionTest.java → .../FieldContentValueAlertConditionTest.java b/...s/FieldStringValueAlertConditionTest.java → .../FieldContentValueAlertConditionTest.java
@@ -48,13 +48,13 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-public class FieldStringValueAlertConditionTest extends AlertConditionTest {
+public class FieldContentValueAlertConditionTest extends AlertConditionTest {
 
     @Test
     public void testConstructor() throws Exception {
         final Map<String, Object> parameters = getParametersMap(0, "field", "value");
 
-        final FieldStringValueAlertCondition condition = getCondition(parameters);
+        final FieldContentValueAlertCondition condition = getCondition(parameters);
 
         assertNotNull(condition);
         assertNotNull(condition.getDescription());
@@ -91,7 +91,7 @@ public void testRunMatchingMessagesInStream() throws Exception {
                 anyInt(),
                 any(Sorting.class)))
             .thenReturn(searchResult);
-        final FieldStringValueAlertCondition condition = getCondition(getParametersMap(0, "message", "something"));
+        final FieldContentValueAlertCondition condition = getCondition(getParametersMap(0, "message", "something"));
 
         alertLastTriggered(-1);
 
@@ -124,7 +124,7 @@ public void testRunNoMatchingMessages() throws Exception {
                 anyInt(),
                 any(Sorting.class)))
                 .thenReturn(searchResult);
-        final FieldStringValueAlertCondition condition = getCondition(getParametersMap(0, "message", "something"));
+        final FieldContentValueAlertCondition condition = getCondition(getParametersMap(0, "message", "something"));
 
         alertLastTriggered(-1);
 
@@ -133,8 +133,8 @@ public void testRunNoMatchingMessages() throws Exception {
         assertNotTriggered(result);
     }
 
-    protected FieldStringValueAlertCondition getCondition(Map<String, Object> parameters) {
+    protected FieldContentValueAlertCondition getCondition(Map<String, Object> parameters) {
-        return new FieldStringValueAlertCondition(
+        return new FieldContentValueAlertCondition(
                 searches,
                 mock(Configuration.class),
                 stream,