[logging-log4j-audit] branch master updated: LOG4J2-2580

[rgoers]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git


The following commit(s) were added to refs/heads/master by this push:
     new 60ab890  LOG4J2-2580
60ab890 is described below

commit 60ab890b2dfc698c670da2e3f24620319c0d3ec2
Author: Andrei Ivanov <andrei.iva...@arnia.ro>
AuthorDate: Tue Apr 2 15:25:17 2019 +0300

    LOG4J2-2580
---
 .../logging/log4j/audit/catalog/CatalogManagerTest.java  | 11 +++++++++--
 .../java/org/apache/logging/log4j/catalog/api/Event.java | 16 +++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git 
a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
 
b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
index e63a080..fc36f66 100644
--- 
a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
+++ 
b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
@@ -19,17 +19,24 @@ package org.apache.logging.log4j.audit.catalog;
 import org.apache.logging.log4j.catalog.api.Event;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 /**
  *
  */
 public class CatalogManagerTest {
-
     @Test
     public void testCatalog() throws Exception {
         CatalogManager manager = new CatalogManagerImpl(new 
StringCatalogReader());
         Event event = manager.getEvent("transfer");
         assertNotNull("No transfer event", event);
+        assertEquals("{\"name\" : \"transfer\", \"displayName\" : 
\"Transfer\", \"description\" : \"Transfer between accounts\", " +
+                             "\"attributes\" : [{\"name\" : \"toAccount\", 
\"required\" : true}, {\"name\" : \"fromAccount\", \"required\" : true}, 
{\"name\" : \"amount\", \"required\" : true}]}",
+                     event.toString());
+
+        Event login = manager.getEvent("login");
+        assertNotNull("No login event", login);
+        assertEquals("{\"name\" : \"login\", \"displayName\" : \"Login\", 
\"description\" : \"User Login\", \"attributes\" : []}", login.toString());
     }
-}
+}
\ No newline at end of file
diff --git 
a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
 
b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
index b6b0b01..8c73819 100644
--- 
a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
+++ 
b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
@@ -175,14 +175,16 @@ public class Event implements Serializable {
         StringBuilder sb = new StringBuilder();
         sb.append("{\"name\" : \"").append(name).append("\", \"displayName\" : 
\"").append(displayName).append("\"");
         sb.append(", \"description\" : \"").append(description).append("\", 
\"attributes\" : [");
-        boolean first = true;
-        for (EventAttribute attribute : attributes) {
-            if (!first) {
-                sb.append(", ");
-            } else {
-                first = false;
+        if (attributes != null) {
+            boolean first = true;
+            for (EventAttribute attribute : attributes) {
+                if (!first) {
+                    sb.append(", ");
+                } else {
+                    first = false;
+                }
+                sb.append("{\"name\" : 
\"").append(attribute.getName()).append("\", \"required\" : 
").append(attribute.isRequired()).append("}");
             }
-            sb.append("{\"name\" : 
\"").append(attribute.getName()).append("\", \"required\" : 
").append(attribute.isRequired()).append("}");
         }
         sb.append("]}");
         return sb.toString();