Fix doc8

JIRA: DMAAP-169 Change-Id: I68350264f90fd1b41bce0cad48de50f3785d6b64 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
author: Morgan Richomme <morgan.richomme@orange.com> 2017-11-08 11:37:09 +0100
committer: Morgan Richomme <morgan.richomme@orange.com> 2017-11-08 11:39:01 +0100
commit: 43ddc4afac7aafd5f0cd158d7d9c64e7c4597b25 (patch)
tree: 671f6e2d335e26e07f29461742373c9b70f8995e /docs
parent: 201409190e22128363178c94be43bb32c4021887 (diff)
3 files changed, 1121 insertions, 1140 deletions
diff --git a/docs/Filter/Filter.rst b/docs/Filter/Filter.rst
index b792a43..38d8dde 100644
--- a/docs/Filter/Filter.rst
+++ b/docs/Filter/Filter.rst
@@ -1,599 +1,591 @@
-=======
-Filter
-======= 
-
-A filter examine an event and decides if it matches or doesn't.  Filters
-are mainly used in rules to decide if the processing entries should be
-executed on the given event. They're also used for settings, and systems
-like the Graph Correlator re-use Highland Park's filter mechanism to
-specify which alarms fit in a correlation.  Some publishers may produce
-topics with a lot of volume and a subscriber may want only a portion of
-those messages. The subscriber can certainly filter messages after
-receiving them, but it may be substantially more efficient to ask the
-API server to filter the messages before sending them to the
-subscriber.The standard library includes a number of simple filters. The
-Equals filter, for example, compares a field's value with some other
-value and returns true if the values match.  The standard library also
-includes filter classes called And, Or, and Not, so you can compose more
-complex filters. For example, written in the standard JSON config
-format: 
-
-+-----------------------------------------+
-| "filter":{                              |
-| "class":"And",                          |
-| "filters":                              |
-| [                                       |
-| { "class":"Equals", "foo":"abc" },      |
-| { "class":"Assigned", "field":"bar" }   |
-| ]                                       |
-| }                                       |
-+-----------------------------------------+
-
-- This filter matches events in which the field "foo" has value "abc"
-  and the field "bar" is assigned to some value (as opposed to not being
-  present on the event). Filters are used by the consumers to filter out
-  data and consume only specific set of data which matches the
-  conditions mentioned in filter. Filters can be passed as a query
-  parameter by the consumer in consume request as mentioned below:
-  **http://localhost:8080/DMaaP/dmaaprest/events/DMaaP/consumergroup/mHOeNFY4XiWx4CBa?filter=\\{"class":"Equals",
-  "field":"email", "value":"test@abc.com" }** 
-- Filters can be applied only on data in JSON format i.e. if applied,
-  filters will automatically ignore any non-json data.  While consuming,
-  request CONTENT\_TYPE is not relevant to filter.
-
-All the supported filter can be found below.
-
-Types of Filters 
-----------------
-
-- DMaaP Message Router supports all the filters which were supported by
-  DMaaP Message Router and are mentioned below:- 
-- **All Alarms:**
-  - Match all alarms. 
-- **And:**
-  - Create a set of filters. This filter matches when all of them matches.
-
-+-------------+--------------------+------------+---------------------+
-| **Field**   | **Description**    | **Type**   | **Notes**           |
-+=============+====================+============+=====================+
-| filters     | Combined Filters   | LIST       | A list of filters   |
-+-------------+--------------------+------------+---------------------+
-|             |                    |            |                     |
-+-------------+--------------------+------------+---------------------+
-
-- **Assigned:**
-  - Choose a field from the event to check for assignment. This filter
-  matches when the field is assigned.
-
-+-------------------+--------------------------------------------------------+------------+-----------------+
-| **Field**         | **Description**                                        | **Type**   | **Notes**       |
-+===================+========================================================+============+=================+
-| field             | The field to check for on the event.                   | STRING     | A field name    |
-+-------------------+--------------------------------------------------------+------------+-----------------+
-| emptyIsAssigned   | If true, an empty value is considered an assignment.   | BOOLEAN    | True or False   |
-+-------------------+--------------------------------------------------------+------------+-----------------+
-
-- **Contains:**
-   - Check if a search string contains another string.
-
-+-------------+---------------------------------------------------+------------+--------------+
-| **Field**   | **Description**                                   | **Type**   | **Notes**    |
-+=============+===================================================+============+==============+
-| String      | The value to search. Supports ${} notation.       | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-| Value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-|             |                                                   |            |              |
-+-------------+---------------------------------------------------+------------+--------------+
-
--  **EndsWith**:
-   -  Check if a search string ends with another string.
-
-+-------------+---------------------------------------------------+------------+--------------+
-| **Field**   | **Description**                                   | **Type**   | **Notes**    |
-+=============+===================================================+============+==============+
-| string      | The value to search. Supports ${} notation.       | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-| value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-
--  **Equals:**
-
-  - Choose a field from the event and a value to check for equality.
-
-+-------------+----------------------------------------------+------------+--------------+
-| **Field**   | **Description**                              | **Type**   | **Notes**    |
-+=============+==============================================+============+==============+
-| field       | The field to check. Supports ${} notation.   | STRING     | Any string   |
-+-------------+----------------------------------------------+------------+--------------+
-| value       | The value to match. Supports ${} notation.   | STRING     | Any string   |
-+-------------+----------------------------------------------+------------+--------------+
-
--  **FlatironObjectExists**
-
-  -  Matches when the given object exists in the given Flatiron instance.
-
-+-------------+---------------------------------------------+------------+--------------+
-| **Field**   | **Description**                             | **Type**   | **Notes**    |
-+=============+=============================================+============+==============+
-| oid         | The OID of the object to look for.          | STRING     | Any string   |
-+-------------+---------------------------------------------+------------+--------------+
-| flatiron    | The name of the Flatiron client instance.   | STRING     | Any string   |
-+-------------+---------------------------------------------+------------+--------------+
-
-- **IsAging**
-  -  Choose a field to test. This filter matches if the expression is
-  numeric.
-
-+-------------+---------------------------------------------+------------+--------------+
-| **Field**   | **Description**                             | **Type**   | **Notes**    |
-+=============+=============================================+============+==============+
-| field       | The field to test. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------+------------+--------------+
-
-- **IsNumeric**
-  - Choose a field to test. This filter matches if the expression is
-  numeric.
-
-+-------------+---------------------------------------------+------------+--------------+
-| **Field**   | **Description**                             | **Type**   | **Notes**    |
-+=============+=============================================+============+==============+
-| field       | The field to test. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------+------------+--------------+
-
-- **MathCondition**
-  - Choose a field from the event and a value for logical math conditions.
-
-+-------------+-------------------------------------------------+------------+-----------------------------------+
-| **Field**   | **Description**                                 | **Type**   | **Notes**                         |
-+=============+=================================================+============+===================================+
-| Field       | The field to check. Supports ${} notation.      | STRING     | Any string                        |
-+-------------+-------------------------------------------------+------------+-----------------------------------+
-| Value       | The value to consider. Supports ${} notation.   | STRING     | Any string                        |
-+-------------+-------------------------------------------------+------------+-----------------------------------+
-| operator    | The operation.                                  | STRING     | One of { "<=", ">=", ">", "<" }   |
-+-------------+-------------------------------------------------+------------+-----------------------------------+
-|             |                                                 |            |                                   |
-+-------------+-------------------------------------------------+------------+-----------------------------------+
-
-- **NoAlarms**
-  -  Don't match any alarms. 
-- **Not**
-  -  Negate the configured filter.
-
-+-------------+-------------------------+------------+-------------+
-| **Field**   | **Description**         | **Type**   | **Notes**   |
-+=============+=========================+============+=============+
-| filter      | The filter to negate.   | FILTER     | A filter    |
-+-------------+-------------------------+------------+-------------+
-
-- **NotEqual**
-  -  Choose a field from the event and a value to check for inequality.
-
-+-------------+----------------------------------------------+------------+--------------+
-| **Field**   | **Description**                              | **Type**   | **Notes**    |
-+=============+==============================================+============+==============+
-| field       | The field to check. Supports ${} notation.   | STRING     | Any string   |
-+-------------+----------------------------------------------+------------+--------------+
-| value       | The value to match. Supports ${} notation.   | STRING     | Any string   |
-+-------------+----------------------------------------------+------------+--------------+
-
-- **NotOneOf**
-  -  Match when the specified field does not have a value from the given
-     list.
-
-+-------------+---------------------------------------------+------------+---------------------+
-| **Field**   | **Description**                             | **Type**   | **Notes**           |
-+=============+=============================================+============+=====================+
-| field       | The field to test. Supports ${} notation.   | STRING     | Any string          |
-+-------------+---------------------------------------------+------------+---------------------+
-| values      | The matching values.                        | LIST       | A list of strings   |
-+-------------+---------------------------------------------+------------+---------------------+
-
-- **OneOf**
-  -  Match when the specified field has a value from the given list.
-
-+-------------+---------------------------------------------+------------+---------------------+
-| **Field**   | **Description**                             | **Type**   | **Notes**           |
-+=============+=============================================+============+=====================+
-| field       | The field to test. Supports ${} notation.   | STRING     | Any string          |
-+-------------+---------------------------------------------+------------+---------------------+
-| values      | The matching values.                        | LIST       | A list of strings   |
-+-------------+---------------------------------------------+------------+---------------------+
-
-- **Or**
-   - Create a set of filters. This filter matches when any one of them
-     matches.
-
-+-------------+--------------------+------------+---------------------+
-| **Field**   | **Description**    | **Type**   | **Notes**           |
-+=============+====================+============+=====================+
-| filters     | Combined Filters   | LIST       | A list of filters   |
-+-------------+--------------------+------------+---------------------+
-
-- **RegEx**
-   - Choose a field from the event to match against the regular expression
-     you provide.
-
-+-------------+---------------------------------------------------------+------------+--------------+
-| **Field**   | **Description**                                         | **Type**   | **Notes**    |
-+=============+=========================================================+============+==============+
-| field       | The text to check for a match. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------------------+------------+--------------+
-| value       | The regular expression (pattern) to match.              | STRING     | Any string   |
-+-------------+---------------------------------------------------------+------------+--------------+
-
-- **StartsWith**
-  - Check if a search string starts with another string.
-
-+-------------+---------------------------------------------------+------------+--------------+
-| **Field**   | **Description**                                   | **Type**   | **Notes**    |
-+=============+===================================================+============+==============+
-| string      | The value to search. Supports ${} notation.       | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-| Value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
-+-------------+---------------------------------------------------+------------+--------------+
-
-- **Unassigned**
-   - Choose a field from the event to check for assignment. This filter
-     matches when the field is not assigned.
-
-+-------------------+--------------------------------------------------------+------------+-----------------+
-| **Field**         | **Description**                                        | **Type**   | **Notes**       |
-+===================+========================================================+============+=================+
-| field             | The field to check for on the event.                   | STRING     | A field name    |
-+-------------------+--------------------------------------------------------+------------+-----------------+
-| emptyIsAssigned   | If true, an empty value is considered an assignment.   | BOOLEAN    | True or False   |
-+-------------------+--------------------------------------------------------+------------+-----------------+
-
-- **WithinSecondsFrom**
-  - This filter matches when the specified epoch time value is within the
-  given number of seconds from the baseline time value. Both time values
-  are assumed to be in seconds. If a value is in milliseconds, set
-  baselineTimeInMillis and/or eventTimeInMillis to true.
-
-+------------------------+------------------------------------------------------------+------------+-----------------+
-| **Field**              | **Description**                                            | **Type**   | **Notes**       |
-+========================+============================================================+============+=================+
-| field                  | The time value to test. Supports ${}                       | STRING     | A field name    |
-+------------------------+------------------------------------------------------------+------------+-----------------+
-| eventTimeInMillis      | Whether to convert the event value from milliseconds.      | BOOLEAN    | True or False   |
-+------------------------+------------------------------------------------------------+------------+-----------------+
-| seconds                | The number of seconds.                                     | NUMBER     | A number        |
-+------------------------+------------------------------------------------------------+------------+-----------------+
-| baselineTimeInMillis   | Whether to convert the baseline value from milliseconds.   | BOOLEAN    | True or False   |
-+------------------------+------------------------------------------------------------+------------+-----------------+
-| baseline               | The baseline time value. Supports ${}.                     | STRING     | Any string      |
-+------------------------+------------------------------------------------------------+------------+-----------------+
-
-- **WithinTimeFromNow**
-  - This filter matches when the named field has an epoch time value
-  within the given number of seconds from the current time. The event's
-  time value is assumed to be in seconds. If it's in milliseconds, set
-  eventTimeInMillis to true.
-
-+---------------------+---------------------------------------------------------+------------+-----------------+
-| **Field**           | **Description**                                         | **Type**   | **Notes**       |
-+=====================+=========================================================+============+=================+
-| field               | The field to check on the event.                        | STRING     | A field name    |
-+---------------------+---------------------------------------------------------+------------+-----------------+
-| eventTimeInMillis   | Whether to convert the event value from milliseconds.   | BOOLEAN    | True or False   |
-+---------------------+---------------------------------------------------------+------------+-----------------+
-| seconds             | The number of seconds.                                  | NUMBER     | A number        |
-+---------------------+---------------------------------------------------------+------------+-----------------+
-
-- **Limit:** 
-
-  -  Limit is the integer value and DMaaP Message Router will consumes
-     only that set of message which are specified in limit.
-	 
-  .. code:: bash
-  
-        Suppose if we set limit=2, then only 2 sets of data will be consumed. 
-        *Get \ **<<topicName>>/group/2?limit=4*** 
-        Let us suppose if 
-        **No of data available** = 4
-        **Set limit** = 6
-        i.e. limit>no of data
-        In this scenario all 4 sets of data will be consumed. 
-
--  If limit is not passed with the url then by default limit is set to
-   4096.
-   
-   .. code:: bash
-
-        i.e. 4096 sets of data will be consumed. 
-        **Timeout and Long Poll:** 
-
--  Timeout is the integer value which will be treated by DMaaP Message
-   Router as time in millisecond.
-
- 
-
--  Get
-
-+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| `***http://localhost/DMaaP/dmaaprest/events/<<topicName>>/group/2?timeout=20000*** <http://localhost/DMaaP/dmaaprest/events/%3c%3ctopicName%3e%3e/group/2?timeout=20000>`__   |
-+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-
--  If there is no data available to be consumed, then DMaaP Message
-   Router will poll for the particular period of time specified in
-   timeout this mechanism is known as Long Poll.
-
--  If timeout is not passed with url then DMaaP Message Router will set
-   the value of timeout =10000
-
--  i.e. if no set of data are available then DMaaP Message Router will
-   poll for 10000 ms.
-
-***Meta:***
-
--  Meta is a Boolean value.
-
--  DMaaP Message Router reads the value of meta from
-   MRConfiguration.properties file at the time of startup.
-
--  If the value of meta is not null and if value of meta is one of these
-   values true, yes, on, 1, y, checked then DMaaP Message Router will
-   take meta flag as true, else it will be false.
-
--  If meta is set to true then consumer will get the value of message
-   offset along with message.
-
-   |image1|
-
-   .. |image1| image:: images/image1.png
-   
-- **Pretty**:
-
--  Pretty is a Boolean value.
-
--  DMaaP Message Router reads the value of pretty from
-   MRConfiguration.properties file at the time of startup.
-
--  If the value of pretty is not null and if value of pretty is one of
-   these values true, yes, on, 1, y, checked then DMaaP Message Router
-   will take pretty flag as true, else it will be false.
-
--  If pretty is set to true then different sets of messages will be
-   printed in next line separated by comma (,).
-
-   |image2|
-   
-   .. |image2| image:: images/image2.png
-   
-- **Filter**
-
-   - A filter examine an event and decides if it matches or doesn't. 
-   - Filters are mainly used in rules to decide if the processing entries
-     should be executed on the given event. They're also used for settings,
-     and systems like the Graph Correlator re-use Highland Park's filter
-     mechanism to specify which alarms fit in a correlation. 
-   - The standard library includes a number of simple filters. The Equals
-     filter, for example, compares a field's value with some other value
-     and returns true if the values match. 
-   - The standard library also includes filter classes called And, Or, and
-     Not, so you can compose more complex filters. For example, written in
-     the standard JSON config format: 
-
-    +-----------------------------------------+
-    | "filter":{                              |
-    | "class":"And",                          |
-    | "filters":                              |
-    | [                                       |
-    | { "class":"Equals", "foo":"abc" },      |
-    | { "class":"Assigned", "field":"bar" }   |
-    | ]                                       |
-    | }                                       |
-    +-----------------------------------------+
-
-   - This filter matches events in which the field "foo" has value "abc"
-   and the field "bar" is assigned to some value (as opposed to not being
-   present on the event).
-   -  Filters are used by the consumers to filter out data and consume only
-   specific set of data which matches the conditions mentioned in filter.
-   -  Filters can be passed as a query parameter by the consumer in consume
-   request as mentioned below:
-   - **http://localhost:8080/DMaaP/dmaaprest/events/DMaaP/consumergroup/mHOeNFY4XiWx4CBa?filter=\\{"class":"Equals",
-     "field":"email", "value":"`test@abc.com <mailto:test@att.com>`__" }** 
-   - Filters can be applied only on data in JSON format i.e. if applied,
-     filters will automatically ignore any non-json data. 
-   - While consuming, request CONTENT\_TYPE is not relevant to filter.
-
-   The MR API allows a subscriber pass a Highland Park filter as part of
-   the GET request. This will filter the stream of messages sent back to
-   the subscriber, but for this to work, there are some requirements: 
-
-   -  The message payload must be JSON
-
-   -  Only a filter built from Highland Park's Standard Library  may be
-      used. (The Cambria API server doesn't have access to plugged in
-      filters.)
-
-   -  The filter must be encoded properly in the URL path.
-
- Server-side filtering can also be setup in the Java client as
-illustrated below
-
-**Filtering Consumer**
-
-You can also provide a Highland Park filter to your consumer instance,
-and this filter is passed on to the server in the GET request. One way
-to create the filter is programmatically. In your code, instantiate a
-filter from the Highland Park Standard Library Then create a String
-representation of the filter using the FilterIo.write utility. This
-String can then be passed to the Cambria client instance for use on the
-server.
-
-Remember, only Highland Park standard library filter components can be
-used -- no plug-ins are available in the Cambria server context.
-	
-	.. code:: bash
-	
-		package org.onap.sa.highlandPark.integration;
-
-		import java.io.IOException;
-
-		import java.util.UUID;
-
-		import org.onap.nsa.cambria.client.CambriaClientFactory;
-
-		import org.onap.nsa.cambria.client.CambriaConsumer;
-
-		import org.onap.sa.highlandPark.processor.HpEvent;
-
-		import org.onap.sa.highlandPark.stdlib.filters.FilterIo;
-
-		import org.onap.sa.highlandPark.stdlib.filters.OneOf;
-
-		public class ExampleFilteringConsumer
-
-		{
-
-		public static void main ( String[] args ) throws IOException,
-		InterruptedException
-
-		{
-
-		// Cambria clients take a set of 1 or more servers to use in round-robin
-		fashion.
-
-		// If a server becomes unreachable, another in the group is used.
-
-		final String
-		serverGroup="ueb01hydc.it.att.com,ueb02hydc.it.att.com,ueb03hydc.it.att.com";
-
-		// choose a topic
-
-		final String topic = "TEST-TOPIC";
-
-		// Cambria clients can run in a cooperative group to handle high-volume
-		topics.
-
-		// Here, we create a random group name, which means this client is not
-		re-startable.
-
-		final String consumerGroup = UUID.randomUUID ().toString ();
-
-		final String consumerId = "0";
-
-		// Cambria clients can sit in a tight loop on the client side, using a
-		long-poll
-
-		// to wait for messages, and a limit to tell the server the most to send
-		at a time.
-
-		final int longPollMs = 30\*1000;
-
-		final int limit = -1;
-
-		// The Cambria server can filter the returned message stream using
-		filters from the
-
-		// Highland Park system. Here, we create a simple filter to test for the
-		AlarmID
-
-		// value being one of the Mobility power alarms.
-
-		final OneOf oneOf = new OneOf ( "AlarmId", kPowerAlarms );
-
-		// create the consumer
-
-		final CambriaConsumer cc = CambriaClientFactory.createConsumer (
-		serverGroup, topic,
-
-		consumerGroup, consumerId, longPollMs, limit, FilterIo.write ( oneOf )
-		);
-
-		// now loop reading messages. Note that cc.fetch() will wait in its HTTP
-		receive
-
-		// method for up to 30 seconds (longPollMs) when nothing's available at
-		the server.
-
-		long count = 0;
-
-		while ( true )
-
-		{
-
-		for ( String msg : cc.fetch () )
-
-		{
-
-		System.out.println ( "" + (++count) + ": " + msg );
-
-		}
-
-		}
-
-		}
-
-		private static final String[] kPowerAlarms =
-
-		{
-
-		"HUB COMMERCIAL POWER FAIL\_FWD",
-
-		"HUB COMMERCIAL POWER FAIL",
-
-		"RBS COMMERCIAL POWER FAIL - Fixed\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - No Generator\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - Portable\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - Shared\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - Yes\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - YES\_FWD",
-
-		"RBS COMMERCIAL POWER FAIL - Fixed",
-
-		"RBS COMMERCIAL POWER FAIL - No Generator",
-
-		"RBS COMMERCIAL POWER FAIL - Portable",
-
-		"RBS COMMERCIAL POWER FAIL - Shared",
-
-		"RBS COMMERCIAL POWER FAIL - YES",
-
-		"RBS COMMERCIAL POWER FAIL - Yes",
-
-		"RBS COMMERCIAL POWER FAIL",
-
-		"HUB COMMERCIAL POWER FAIL - Fixed",
-
-		"HUB COMMERCIAL POWER FAIL - No Generator",
-
-		"HUB COMMERCIAL POWER FAIL - Portable",
-
-		"HUB COMMERCIAL POWER FAIL - Shared",
-
-		"HUB COMMERCIAL POWER FAIL - Fixed\_FWD",
-
-		"HUB COMMERCIAL POWER FAIL - No Generator\_FWD",
-
-		"HUB COMMERCIAL POWER FAIL - Portable\_FWD",
-
-		"HUB COMMERCIAL POWER FAIL - Shared\_FWD",
-
-		};
-
-		}
-
- 
-
-**Filter Builder**
-
- MR server-side filtering allows a consumer to filter the stream of
- messages returned from the GET call.  The following link provide details
- of building some of the filter to illustrate Filter Builder.  It is not
- meant to cover and provide examples of every filter
-
-
-
-
+=======
+Filter
+=======
+
+A filter examine an event and decides if it matches or doesn't.  Filters
+are mainly used in rules to decide if the processing entries should be
+executed on the given event. They're also used for settings, and systems
+like the Graph Correlator re-use Highland Park's filter mechanism to
+specify which alarms fit in a correlation.  Some publishers may produce
+topics with a lot of volume and a subscriber may want only a portion of
+those messages. The subscriber can certainly filter messages after
+receiving them, but it may be substantially more efficient to ask the
+API server to filter the messages before sending them to the
+subscriber.The standard library includes a number of simple filters. The
+Equals filter, for example, compares a field's value with some other
+value and returns true if the values match.  The standard library also
+includes filter classes called And, Or, and Not, so you can compose more
+complex filters. For example, written in the standard JSON config
+format:
+
++-----------------------------------------+
+| "filter":{                              |
+| "class":"And",                          |
+| "filters":                              |
+| [                                       |
+| { "class":"Equals", "foo":"abc" },      |
+| { "class":"Assigned", "field":"bar" }   |
+| ]                                       |
+| }                                       |
++-----------------------------------------+
+
+- This filter matches events in which the field "foo" has value "abc"
+  and the field "bar" is assigned to some value (as opposed to not being
+  present on the event). Filters are used by the consumers to filter out
+  data and consume only specific set of data which matches the
+  conditions mentioned in filter. Filters can be passed as a query
+  parameter by the consumer in consume request as mentioned below:
+  **http://localhost:8080/DMaaP/dmaaprest/events/DMaaP/consumergroup/mHOeNFY4XiWx4CBa?filter=\\{"class":"Equals",
+  "field":"email", "value":"test@abc.com" }**
+- Filters can be applied only on data in JSON format i.e. if applied,
+  filters will automatically ignore any non-json data.  While consuming,
+  request CONTENT\_TYPE is not relevant to filter.
+
+All the supported filter can be found below.
+
+Types of Filters
+----------------
+
+- DMaaP Message Router supports all the filters which were supported by
+  DMaaP Message Router and are mentioned below:-
+- **All Alarms:**
+  - Match all alarms.
+- **And:**
+  - Create a set of filters. This filter matches when all of them matches.
+
++-------------+--------------------+------------+---------------------+
+| **Field**   | **Description**    | **Type**   | **Notes**           |
++=============+====================+============+=====================+
+| filters     | Combined Filters   | LIST       | A list of filters   |
++-------------+--------------------+------------+---------------------+
+|             |                    |            |                     |
++-------------+--------------------+------------+---------------------+
+
+- **Assigned:**
+  - Choose a field from the event to check for assignment. This filter
+  matches when the field is assigned.
+
++-------------------+--------------------------------------------------------+------------+-----------------+
+| **Field**         | **Description**                                        | **Type**   | **Notes**       |
++===================+========================================================+============+=================+
+| field             | The field to check for on the event.                   | STRING     | A field name    |
++-------------------+--------------------------------------------------------+------------+-----------------+
+| emptyIsAssigned   | If true, an empty value is considered an assignment.   | BOOLEAN    | True or False   |
++-------------------+--------------------------------------------------------+------------+-----------------+
+
+- **Contains:**
+   - Check if a search string contains another string.
+
++-------------+---------------------------------------------------+------------+--------------+
+| **Field**   | **Description**                                   | **Type**   | **Notes**    |
++=============+===================================================+============+==============+
+| String      | The value to search. Supports ${} notation.       | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+| Value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+|             |                                                   |            |              |
++-------------+---------------------------------------------------+------------+--------------+
+
+-  **EndsWith**:
+   -  Check if a search string ends with another string.
+
++-------------+---------------------------------------------------+------------+--------------+
+| **Field**   | **Description**                                   | **Type**   | **Notes**    |
++=============+===================================================+============+==============+
+| string      | The value to search. Supports ${} notation.       | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+| value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+
+-  **Equals:**
+
+  - Choose a field from the event and a value to check for equality.
+
++-------------+----------------------------------------------+------------+--------------+
+| **Field**   | **Description**                              | **Type**   | **Notes**    |
++=============+==============================================+============+==============+
+| field       | The field to check. Supports ${} notation.   | STRING     | Any string   |
++-------------+----------------------------------------------+------------+--------------+
+| value       | The value to match. Supports ${} notation.   | STRING     | Any string   |
++-------------+----------------------------------------------+------------+--------------+
+
+-  **FlatironObjectExists**
+
+  -  Matches when the given object exists in the given Flatiron instance.
+
++-------------+---------------------------------------------+------------+--------------+
+| **Field**   | **Description**                             | **Type**   | **Notes**    |
++=============+=============================================+============+==============+
+| oid         | The OID of the object to look for.          | STRING     | Any string   |
++-------------+---------------------------------------------+------------+--------------+
+| flatiron    | The name of the Flatiron client instance.   | STRING     | Any string   |
++-------------+---------------------------------------------+------------+--------------+
+
+- **IsAging**
+  -  Choose a field to test. This filter matches if the expression is
+  numeric.
+
++-------------+---------------------------------------------+------------+--------------+
+| **Field**   | **Description**                             | **Type**   | **Notes**    |
++=============+=============================================+============+==============+
+| field       | The field to test. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------+------------+--------------+
+
+- **IsNumeric**
+  - Choose a field to test. This filter matches if the expression is
+  numeric.
+
++-------------+---------------------------------------------+------------+--------------+
+| **Field**   | **Description**                             | **Type**   | **Notes**    |
++=============+=============================================+============+==============+
+| field       | The field to test. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------+------------+--------------+
+
+- **MathCondition**
+  - Choose a field from the event and a value for logical math conditions.
+
++-------------+-------------------------------------------------+------------+-----------------------------------+
+| **Field**   | **Description**                                 | **Type**   | **Notes**                         |
++=============+=================================================+============+===================================+
+| Field       | The field to check. Supports ${} notation.      | STRING     | Any string                        |
++-------------+-------------------------------------------------+------------+-----------------------------------+
+| Value       | The value to consider. Supports ${} notation.   | STRING     | Any string                        |
++-------------+-------------------------------------------------+------------+-----------------------------------+
+| operator    | The operation.                                  | STRING     | One of { "<=", ">=", ">", "<" }   |
++-------------+-------------------------------------------------+------------+-----------------------------------+
+|             |                                                 |            |                                   |
++-------------+-------------------------------------------------+------------+-----------------------------------+
+
+- **NoAlarms**
+  -  Don't match any alarms.
+- **Not**
+  -  Negate the configured filter.
+
++-------------+-------------------------+------------+-------------+
+| **Field**   | **Description**         | **Type**   | **Notes**   |
++=============+=========================+============+=============+
+| filter      | The filter to negate.   | FILTER     | A filter    |
++-------------+-------------------------+------------+-------------+
+
+- **NotEqual**
+  -  Choose a field from the event and a value to check for inequality.
+
++-------------+----------------------------------------------+------------+--------------+
+| **Field**   | **Description**                              | **Type**   | **Notes**    |
++=============+==============================================+============+==============+
+| field       | The field to check. Supports ${} notation.   | STRING     | Any string   |
++-------------+----------------------------------------------+------------+--------------+
+| value       | The value to match. Supports ${} notation.   | STRING     | Any string   |
++-------------+----------------------------------------------+------------+--------------+
+
+- **NotOneOf**
+  -  Match when the specified field does not have a value from the given list.
+
++-------------+---------------------------------------------+------------+---------------------+
+| **Field**   | **Description**                             | **Type**   | **Notes**           |
++=============+=============================================+============+=====================+
+| field       | The field to test. Supports ${} notation.   | STRING     | Any string          |
++-------------+---------------------------------------------+------------+---------------------+
+| values      | The matching values.                        | LIST       | A list of strings   |
++-------------+---------------------------------------------+------------+---------------------+
+
+- **OneOf**
+  -  Match when the specified field has a value from the given list.
+
++-------------+---------------------------------------------+------------+---------------------+
+| **Field**   | **Description**                             | **Type**   | **Notes**           |
++=============+=============================================+============+=====================+
+| field       | The field to test. Supports ${} notation.   | STRING     | Any string          |
++-------------+---------------------------------------------+------------+---------------------+
+| values      | The matching values.                        | LIST       | A list of strings   |
++-------------+---------------------------------------------+------------+---------------------+
+
+- **Or**
+   - Create a set of filters. This filter matches when any one of them
+     matches.
+
++-------------+--------------------+------------+---------------------+
+| **Field**   | **Description**    | **Type**   | **Notes**           |
++=============+====================+============+=====================+
+| filters     | Combined Filters   | LIST       | A list of filters   |
++-------------+--------------------+------------+---------------------+
+
+- **RegEx**
+   - Choose a field from the event to match against the regular expression
+     you provide.
+
++-------------+---------------------------------------------------------+------------+--------------+
+| **Field**   | **Description**                                         | **Type**   | **Notes**    |
++=============+=========================================================+============+==============+
+| field       | The text to check for a match. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------------------+------------+--------------+
+| value       | The regular expression (pattern) to match.              | STRING     | Any string   |
++-------------+---------------------------------------------------------+------------+--------------+
+
+- **StartsWith**
+  - Check if a search string starts with another string.
+
++-------------+---------------------------------------------------+------------+--------------+
+| **Field**   | **Description**                                   | **Type**   | **Notes**    |
++=============+===================================================+============+==============+
+| string      | The value to search. Supports ${} notation.       | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+| Value       | The value to search for. Supports ${} notation.   | STRING     | Any string   |
++-------------+---------------------------------------------------+------------+--------------+
+
+- **Unassigned**
+   - Choose a field from the event to check for assignment. This filter
+     matches when the field is not assigned.
+
++-------------------+--------------------------------------------------------+------------+-----------------+
+| **Field**         | **Description**                                        | **Type**   | **Notes**       |
++===================+========================================================+============+=================+
+| field             | The field to check for on the event.                   | STRING     | A field name    |
++-------------------+--------------------------------------------------------+------------+-----------------+
+| emptyIsAssigned   | If true, an empty value is considered an assignment.   | BOOLEAN    | True or False   |
++-------------------+--------------------------------------------------------+------------+-----------------+
+
+- **WithinSecondsFrom**
+  - This filter matches when the specified epoch time value is within the
+  given number of seconds from the baseline time value. Both time values
+  are assumed to be in seconds. If a value is in milliseconds, set
+  baselineTimeInMillis and/or eventTimeInMillis to true.
+
++------------------------+------------------------------------------------------------+------------+-----------------+
+| **Field**              | **Description**                                            | **Type**   | **Notes**       |
++========================+============================================================+============+=================+
+| field                  | The time value to test. Supports ${}                       | STRING     | A field name    |
++------------------------+------------------------------------------------------------+------------+-----------------+
+| eventTimeInMillis      | Whether to convert the event value from milliseconds.      | BOOLEAN    | True or False   |
++------------------------+------------------------------------------------------------+------------+-----------------+
+| seconds                | The number of seconds.                                     | NUMBER     | A number        |
++------------------------+------------------------------------------------------------+------------+-----------------+
+| baselineTimeInMillis   | Whether to convert the baseline value from milliseconds.   | BOOLEAN    | True or False   |
++------------------------+------------------------------------------------------------+------------+-----------------+
+| baseline               | The baseline time value. Supports ${}.                     | STRING     | Any string      |
++------------------------+------------------------------------------------------------+------------+-----------------+
+
+- **WithinTimeFromNow**
+  - This filter matches when the named field has an epoch time value
+  within the given number of seconds from the current time. The event's
+  time value is assumed to be in seconds. If it's in milliseconds, set
+  eventTimeInMillis to true.
+
++---------------------+---------------------------------------------------------+------------+-----------------+
+| **Field**           | **Description**                                         | **Type**   | **Notes**       |
++=====================+=========================================================+============+=================+
+| field               | The field to check on the event.                        | STRING     | A field name    |
++---------------------+---------------------------------------------------------+------------+-----------------+
+| eventTimeInMillis   | Whether to convert the event value from milliseconds.   | BOOLEAN    | True or False   |
++---------------------+---------------------------------------------------------+------------+-----------------+
+| seconds             | The number of seconds.                                  | NUMBER     | A number        |
++---------------------+---------------------------------------------------------+------------+-----------------+
+
+- **Limit:**
+
+  -  Limit is the integer value and DMaaP Message Router will consumes
+     only that set of message which are specified in limit.
+
+  .. code:: bash
+
+        Suppose if we set limit=2, then only 2 sets of data will be consumed.
+        *Get \ **<<topicName>>/group/2?limit=4***
+        Let us suppose if
+        **No of data available** = 4
+        **Set limit** = 6
+        i.e. limit>no of data
+        In this scenario all 4 sets of data will be consumed.
+
+-  If limit is not passed with the url then by default limit is set to
+   4096.
+
+   .. code:: bash
+
+        i.e. 4096 sets of data will be consumed.
+        **Timeout and Long Poll:**
+
+-  Timeout is the integer value which will be treated by DMaaP Message
+   Router as time in millisecond.
+
+
+
+-  Get
+
++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| `***http://localhost/DMaaP/dmaaprest/events/<<topicName>>/group/2?timeout=20000*** <http://localhost/DMaaP/dmaaprest/events/%3c%3ctopicName%3e%3e/group/2?timeout=20000>`__   |
++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+-  If there is no data available to be consumed, then DMaaP Message
+   Router will poll for the particular period of time specified in
+   timeout this mechanism is known as Long Poll.
+
+-  If timeout is not passed with url then DMaaP Message Router will set
+   the value of timeout =10000
+
+-  i.e. if no set of data are available then DMaaP Message Router will
+   poll for 10000 ms.
+
+***Meta:***
+
+-  Meta is a Boolean value.
+
+-  DMaaP Message Router reads the value of meta from
+   MRConfiguration.properties file at the time of startup.
+
+-  If the value of meta is not null and if value of meta is one of these
+   values true, yes, on, 1, y, checked then DMaaP Message Router will
+   take meta flag as true, else it will be false.
+
+-  If meta is set to true then consumer will get the value of message
+   offset along with message.
+
+   |image1|
+
+   .. |image1| image:: images/image1.png
+
+- **Pretty**:
+
+-  Pretty is a Boolean value.
+
+-  DMaaP Message Router reads the value of pretty from
+   MRConfiguration.properties file at the time of startup.
+
+-  If the value of pretty is not null and if value of pretty is one of
+   these values true, yes, on, 1, y, checked then DMaaP Message Router
+   will take pretty flag as true, else it will be false.
+
+-  If pretty is set to true then different sets of messages will be
+   printed in next line separated by comma (,).
+
+   |image2|
+
+   .. |image2| image:: images/image2.png
+
+- **Filter**
+
+   - A filter examine an event and decides if it matches or doesn't.
+   - Filters are mainly used in rules to decide if the processing entries
+     should be executed on the given event. They're also used for settings,
+     and systems like the Graph Correlator re-use Highland Park's filter
+     mechanism to specify which alarms fit in a correlation.
+   - The standard library includes a number of simple filters. The Equals
+     filter, for example, compares a field's value with some other value
+     and returns true if the values match.
+   - The standard library also includes filter classes called And, Or, and
+     Not, so you can compose more complex filters. For example, written in
+     the standard JSON config format:
+
+    +-----------------------------------------+
+    | "filter":{                              |
+    | "class":"And",                          |
+    | "filters":                              |
+    | [                                       |
+    | { "class":"Equals", "foo":"abc" },      |
+    | { "class":"Assigned", "field":"bar" }   |
+    | ]                                       |
+    | }                                       |
+    +-----------------------------------------+
+
+   - This filter matches events in which the field "foo" has value "abc" and
+     the field "bar" is assigned to some value (as opposed to not being
+     present on the event).
+   - Filters are used by the consumers to filter out data and consume only
+     specific set of data which matches the conditions mentioned in filter.
+   - Filters can be passed as a query parameter by the consumer in consume
+     request as mentioned below:
+     - **http://localhost:8080/DMaaP/dmaaprest/events/DMaaP/consumergroup/mHOeNFY4XiWx4CBa?filter=\\{"class":"Equals","field":"email", "value":"`test@abc.com <mailto:test@att.com>`__" }**
+     - Filters can be applied only on data in JSON format i.e. if applied, filters will automatically ignore any non-json data.
+     - While consuming, request CONTENT\_TYPE is not relevant to filter.
+
+   The MR API allows a subscriber pass a Highland Park filter as part of
+   the GET request. This will filter the stream of messages sent back to
+   the subscriber, but for this to work, there are some requirements:
+
+   -  The message payload must be JSON
+
+   -  Only a filter built from Highland Park's Standard Library  may be
+      used. (The Cambria API server doesn't have access to plugged in
+      filters.)
+
+   -  The filter must be encoded properly in the URL path.
+
+Server-side filtering can also be setup in the Java client as illustrated below
+
+**Filtering Consumer**
+
+You can also provide a Highland Park filter to your consumer instance,
+and this filter is passed on to the server in the GET request. One way
+to create the filter is programmatically. In your code, instantiate a
+filter from the Highland Park Standard Library Then create a String
+representation of the filter using the FilterIo.write utility. This
+String can then be passed to the Cambria client instance for use on the
+server.
+
+Remember, only Highland Park standard library filter components can be
+used -- no plug-ins are available in the Cambria server context.
+
+  .. code:: bash
+
+  package org.onap.sa.highlandPark.integration;
+
+  import java.io.IOException;
+
+  import java.util.UUID;
+
+  import org.onap.nsa.cambria.client.CambriaClientFactory;
+
+  import org.onap.nsa.cambria.client.CambriaConsumer;
+
+  import org.onap.sa.highlandPark.processor.HpEvent;
+
+  import org.onap.sa.highlandPark.stdlib.filters.FilterIo;
+
+  import org.onap.sa.highlandPark.stdlib.filters.OneOf;
+
+  public class ExampleFilteringConsumer
+
+  {
+
+  public static void main ( String[] args ) throws IOException,
+  InterruptedException
+
+  {
+
+  // Cambria clients take a set of 1 or more servers to use in round-robin
+  fashion.
+
+  // If a server becomes unreachable, another in the group is used.
+
+  final String
+  serverGroup="ueb01hydc.it.att.com,ueb02hydc.it.att.com,ueb03hydc.it.att.com";
+
+  // choose a topic
+
+  final String topic = "TEST-TOPIC";
+
+  // Cambria clients can run in a cooperative group to handle high-volume
+  topics.
+
+  // Here, we create a random group name, which means this client is not
+  re-startable.
+
+  final String consumerGroup = UUID.randomUUID ().toString ();
+
+  final String consumerId = "0";
+
+  // Cambria clients can sit in a tight loop on the client side, using a
+  long-poll
+
+  // to wait for messages, and a limit to tell the server the most to send
+  at a time.
+
+  final int longPollMs = 30\*1000;
+
+  final int limit = -1;
+
+  // The Cambria server can filter the returned message stream using
+  filters from the
+
+  // Highland Park system. Here, we create a simple filter to test for the
+  AlarmID
+
+  // value being one of the Mobility power alarms.
+
+  final OneOf oneOf = new OneOf ( "AlarmId", kPowerAlarms );
+
+  // create the consumer
+
+  final CambriaConsumer cc = CambriaClientFactory.createConsumer (
+  serverGroup, topic,
+
+  consumerGroup, consumerId, longPollMs, limit, FilterIo.write ( oneOf )
+  );
+
+  // now loop reading messages. Note that cc.fetch() will wait in its HTTP
+  receive
+
+  // method for up to 30 seconds (longPollMs) when nothing's available at
+  the server.
+
+  long count = 0;
+
+  while ( true )
+
+  {
+
+  for ( String msg : cc.fetch () )
+
+  {
+
+  System.out.println ( "" + (++count) + ": " + msg );
+
+  }
+
+  }
+
+  }
+
+  private static final String[] kPowerAlarms =
+
+  {
+
+  "HUB COMMERCIAL POWER FAIL\_FWD",
+
+  "HUB COMMERCIAL POWER FAIL",
+
+  "RBS COMMERCIAL POWER FAIL - Fixed\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - No Generator\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - Portable\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - Shared\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - Yes\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - YES\_FWD",
+
+  "RBS COMMERCIAL POWER FAIL - Fixed",
+
+  "RBS COMMERCIAL POWER FAIL - No Generator",
+
+  "RBS COMMERCIAL POWER FAIL - Portable",
+
+  "RBS COMMERCIAL POWER FAIL - Shared",
+
+  "RBS COMMERCIAL POWER FAIL - YES",
+
+  "RBS COMMERCIAL POWER FAIL - Yes",
+
+  "RBS COMMERCIAL POWER FAIL",
+
+  "HUB COMMERCIAL POWER FAIL - Fixed",
+
+  "HUB COMMERCIAL POWER FAIL - No Generator",
+
+  "HUB COMMERCIAL POWER FAIL - Portable",
+
+  "HUB COMMERCIAL POWER FAIL - Shared",
+
+  "HUB COMMERCIAL POWER FAIL - Fixed\_FWD",
+
+  "HUB COMMERCIAL POWER FAIL - No Generator\_FWD",
+
+  "HUB COMMERCIAL POWER FAIL - Portable\_FWD",
+
+  "HUB COMMERCIAL POWER FAIL - Shared\_FWD",
+
+  };
+
+  }
+
+
+
+**Filter Builder**
+
+ MR server-side filtering allows a consumer to filter the stream of
+ messages returned from the GET call.  The following link provide details
+ of building some of the filter to illustrate Filter Builder.  It is not
+ meant to cover and provide examples of every filter
diff --git a/docs/message-router/message-router.rst b/docs/message-router/message-router.rst
index 43799a7..6d08b16 100644
--- a/docs/message-router/message-router.rst
+++ b/docs/message-router/message-router.rst
@@ -1,539 +1,530 @@
-============================================
-Message Router (MR) API Guide
-============================================
-Architecture
--------------
-
-In DMaaP Message Router, Restful web service is exposed to client to perform any needed action with Kafka. After getting the request it calls the Message router service layer which is created using AJSC ( AT&T Java Service Container) . AJSC finally calls Kafka services and response is sent back.
-
-   |image0|
-
-   .. |image0| image:: image1.png
-   
-
-HTTP Service APIs
-------------------
-
-DMaaP Message Router utilizes an HTTP REST API to service all Publish
-and Consume transactions. HTTP and REST standards are followed so
-clients as varied as CURL, Java applications and even Web Browsers will
-work to interact with Message Router.Message Router uses AAF for user's
-authentication and authorization.
-
-General HTTP Requirements
-=========================
-
-A DMaaP Message Router transactions consists of 4 distinct segments,
-HTTP URL, HTTP Header, HTTP Body (POST) and HTTP Response. The general
-considerations for each segment are as follows and are required for each
-of the specific transactions described in this section.
-
-HTTP URL
-========
-
-http[s]://Username:Password@serverBaseURL{/routing}{resourcePath}
-
-- The Username:Password utilizes HTTP Basic Authentication and HTTPS/TLS to securely transmit the authorization and authentication credentials that AAF needs to validate the client's access to the requested resource.
-
-- The serverBaseURL points to DMaaP Message Router host/port that will service the request. Optionally DME2 service end points for Message Router can be used.
-
-- The resourcePath specifies the specific service, or Topic, that the client is attempting to reach
-
-HTTP Header
-===========
-
-Specifies HTTP Headers, such as Content-Type, that define the parameters
-of the HTTP Transaction
-
-HTTP Body
-=========
-
-The HTTP Body contains the topic content when Publishing or Consuming.
-The Body may contain topic messages in several formats (like below) but
-it must be noted, that, except in very specific circumstances, messages
-are not inspected for content.
-
-
-+-------------------------+-----------------------------------------------------------------------------------------------------------------+
-| Content-Type            |  Description                                                                                                    |
-+=========================+=================================================================================================================+
-| text/plain              | Each line in the POST body is treated as a separate message. No partition key is specified, and therefore no    |
-|                         | order is guaranteed. This format is mainly for test, as messages are highly likely to be re-ordered when        |
-|                         | delivered through the Kafka cluster.                                                                            |
-+-------------------------+-----------------------------------------------------------------------------------------------------------------+
-| application/json        | The payload maybe a single JSON object or a JSON array of JSON objects. Each object is handled as an individual |
-|                         | message..Note that use of this format may result in equivalent but altered JSON objects sent to consumers.      | 
-|                         | That's because MR uses a standard JSON parser to read each object into memory before pushing the object to the  |
-|                         | Kafka system. At that point, the JSON object is re-written from the in-memory object. This can result in        |
-|                         | re-ordered fields or changes in whitespace. If you want to preseve JSON objects exactly,                        |
-|                         | use application/cambria. Recommended to follow the JSON format.                                                 |
-+-------------------------+-----------------------------------------------------------------------------------------------------------------+
-
-Publishers
------------
-
-**Description**:Publishes data to Kafka server on the topic mentioned in the URL.
-Messages will be in the request body
-
-The MessageRouter service has no requirements on what publishers can put
-onto a topic. The messages are opaque to the service and are treated as
-raw bytes. In general, passing JSON messages is preferred, but this is
-due to higher-level features and related systems, not the MessageRouter
-broker itself. The only constraint placed on messages is their on their
-size � messages must be under the maximum size, which is currently
-configured at 1 MB.
-
-Request URL
-===========
-
-POST http(s)://{HOST:PORT}/events/{topicname}
-
-Request Parameters
-==================
-
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-| Name               | Description                  | Param Type       | Data type  | Max Len   | Required    | Format                         | Valid/EXample values        |
-+====================+==============================+==================+============+===========+=============+================================+=============================+
-| Topicname          | topic name to be posted      | Path             | String     | 40        | Y           |  <app namespace>.<topicname>   | org.onap.crm.empdetails     |
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-| content-type       | To specify type of message   | Header           | String     | 20        | N           |                                | application/json            |
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-| Username           | userid                       | Header           | String     |           | N           | Basic Authentication Header    |                             |
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-| Password           |                              | Header           | String     |           | N           | Basic Authentication Header    |                             |
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-| partitionKey       |                              | QueryParam       | String     |           | N           | String value                   | ?Partitionkey=123           |
-+--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
-
-**NOTE**: Publishers/user should have access on the topics. The user (id) and
-permissions details needs to be in AAF.
-
-Response Parameters
-===================
-
-+------------------+------------------------+------------+--------------+------------------------------+
-| Name             | Description            | Type       | Format       | Valid/Example Values         |
-+==================+========================+============+==============+==============================+
-| httpStatusCode   |                        |            |              | 200, 201 etc.                |
-+------------------+------------------------+------------+--------------+------------------------------+
-| mrErrorCode      | Numeric error code     |            |              | 200, 201 etc.                |
-+------------------+------------------------+------------+--------------+------------------------------+
-| errorMessage     |                        |            |              | SUCCESS, or error message.   |
-+------------------+------------------------+------------+--------------+------------------------------+
-| helpURL          | helpurl                |            |              |                              |
-+------------------+------------------------+------------+--------------+------------------------------+
-| transactionid    | transaction-id value   |            |              |                              |
-+------------------+------------------------+------------+--------------+------------------------------+
-
- 
-
-Response /Error Codes
-=====================
-
-+---------------------------+------------------------------------+
-| Response statusCode       |  Response statusMessage            |
-+===========================+====================================+
-| 200-299                   | Success                            |
-+---------------------------+------------------------------------+
-| 400-499                   | the client request has a problem   |
-+---------------------------+------------------------------------+
-| 500-599                   | the DMaaP service has a problem    |
-+---------------------------+------------------------------------+
-
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| Error code             |  HTTPCode     |  Description                    | Issue Reason                                                                                            |
-+========================+===============+=================================+=========================================================================================================+
-| DMaaP\_MR\_ERR\_3001   | 413           | Request Entity too large        | Message size exceeds the batch limit <limit>.Reduce the batch size and try again                        |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3002   | 500           | Internal Server Error           | Unable to publish messages. Please contact administrator                                                |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3003   | 400           | Bad Request                     | Incorrect Batching format. Please correct the batching format and try again                             |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3004   | 413           | Request Entity too large        | Message size exceeds the message size limit <limit>.Reduce the message size and try again               |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3005   | 400           | Bad Request                     | Incorrect JSON object. Please correct the JSON format and try again                                     |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3006   | 504           | Network Connect Timeout Error   | Connection to the DMaaP MR was timed out.Please try again                                               |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3007   | 500           | Internal Server Error           | Failed to publish  messages to topic <topicName>. Successfully published <count > number of messages.   |
-+------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
-
-Sample Request:
-===============
-
-+-----------------------------------------------------------------------------------+
-| POST                                                                              |
-|                                                                                   |
-| *Payload-* *{"message":"message description"}* *Content-Type: application/json*   |
-|                                                                                   |
-| Example:                                                                          |
-|                                                                                   |
-| curl -u XXXX@abc.com:X -H 'Content-Type:text/plain' -X POST -d @sampleMsg.txt     |
-|                                                                                   |
-| {    "count": 1,                                                                  |
-|                                                                                   |
-|     "serverTimeMs": 19"                                                           |
-|                                                                                   |
-| }                                                                                 |
-+-----------------------------------------------------------------------------------+
-
-Sample Response:
-================
-
-+---------------------------------------------------------------------+
-| HTTP/1.1 200 OK                                                     |
-|                                                                     |
-|     Server: Apache-Coyote/1.1                                       |
-|                                                                     |
-|     transactionId: 28-12-2015::08:18:50:682::<IP>::28122015552391   |
-|                                                                     |
-|     Content-Type: application/json                                  |
-|                                                                     |
-|     Content-Length: 42                                              |
-|                                                                     |
-|     Date: Mon, 28 Dec 2015 13:18:50 GMT                             |
-+---------------------------------------------------------------------+
-
- 
-
-Subscribers
------------
-**Description**:To subscribe to a MessageRouter topic, a subscriber issues a GET to the RESTful HTTP endpoint for events.
-
-Request URL:
-============
-
-GET http(s)://{HOST:PORT}}/events/{topicname}/{consumegroup}/{consumerid}/{timeout=x}
-
-Request Parameters:
-===================
-
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| Name         | Description                     |  Param Type      |  data type |   MaxLen     |  Required   |  Format             |  Valid/Example Values  |
-+==============+=================================+==================+============+==============+=============+=====================+========================+
-| Topicname    | topic name to be posted         |     Path         |   String   |    40        |     Y       | namespace.String    |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| Consumer     | A name that uniquely identifies |     Path         |   String   |              |     Y       |                     | CG1                    |
-| group        | your subscribers                |                  |            |              |             |                     |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| consumerId   | Within your subscribers group,  |     Path         |   String   |              |     Y       |                     | C1                     |
-|              | a name that uniquely identifies |                  |            |              |             |                     |                        |
-|              | your subscribers  process       |                  |            |              |             |                     |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| content-type | To specify type of message      |     Header       |   String   |     20       |     N       |                     | aplication/json        |
-|              | content(json,text or cambria)   |                  |            |              |             |                     |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| Username     | userid                          |     Header       |   String   |     1        |     N       |                     |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
-| Password     |                                 |     Header       |   String   |     1        |     N       |                     |                        |
-+--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+ 
-
-**NOTE1**:Subscribers /user should have access on the topics. The user () and
-permissions details needs to be in AAF.
-
-Response Parameters:
-====================
-
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| Name             | Description                    |  Type      | Format       | Valid/Example Values                                      |
-+==================+================================+============+==============+===========================================================+
-| httpStatusCode   |                                |            |              | 200, 201 etc.                                             |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| mrErrorCode      | Numeric error code             |            |              | 200, 201 etc.                                             |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| errorMessage     |                                |            |              | SUCCESS, or error message.                                |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| helpURL          | helpurl                        |            |              |                                                           |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| tranactionid     | transaction-id value           |            |              | 28-12-2015::08:18:50:682::135.25.227.66::28122015552391   |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| ResponseBody     | Messages consumed from topic   | Json       | Json         |                                                           |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-
-
-Response /Error Codes
-=====================
-
-
-+---------------------------+------------------------------------+
-| Response statusCode       | Response statusMessage             |
-+===========================+====================================+
-| 200-299                   | Success                            |
-+---------------------------+------------------------------------+
-| 400-499                   | the client request has a problem   |
-+---------------------------+------------------------------------+
-| 500-599                   | the DMaaP service has a problem    |
-+---------------------------+------------------------------------+
-
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-| Error code              |  HTTPCode       |  Description               | Issue Reason                                                                                |
-+=========================+=================+============================+=============================================================================================+
-| DMaaP\_MR\_ERR\_3008    | 413             | Request Entity too large   | Message size exceeds the batch limit <limit>.Reduce the batch size and try again            |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3009    | 500             | Internal Server Error      | Unable to publish messages. Please contact administartor                                    |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3010    | 400             | Bad Request                | Incorrect Batching format. Please correct the batching format and try again                 |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_3011    | 413             | Request Entity too large   | Message size exceeds the message size limit <limit>.Reduce the message size and try again   |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-| DMaaP\_MR\_ERR\_5012    | 429             | Too many requests          | This client is making too many requests. Please use a long poll setting to decrease the     | 
-|                         |                 |                            | number of requests that result in empty responses.                                          |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-|                         | 503             | Service Unavailable        | Service Unavailable.                                                                        |
-+-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
-
-Sample Request:
-===============
-
-+----------------------------------------------------------------------------------------------------+
-| GET  http://<hostname>:3904/events/com.att.dmaap.mr.sprint/mygroup/mycus                           |
-|                                                                                                    |
-| Content-Type: application/json                                                                     |
-|                                                                                                    |
-| Example:                                                                                           |
-|                                                                                                    |
-|curl -u XXX@csp.abc.com:MRDmap2016$ -X GET -d 'MyfirstMessage'                                      |
-|                                                                                                    | 
-|http://mrlocal00.dcae.proto.research.att.com:3904/events/com.att.ecomp_test.crm.preDeo/myG/C1       |
-|                                                                                                    |
-|[I am r sending first msg,I am R sending first msg]                                                 |
-+----------------------------------------------------------------------------------------------------+
-
-Provisioning
-------------
-**Description**: To create , modify or delete the MessageRouter topics. Generally Invenio application will use these  below apis to create , assign topics to the users. These APIs can also be used by other applications to provision topics in MessageRouter
-
-Create Topic
-============
-Request URL:
-============
-
-POST http(s)://{HOST:PORT}/topics/create
-
-Request Parameters:
-===================
-
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
-| Name              | Description                     |  Param Type      |  datatype  |   MaxLen     |  Required   |  Format     |  Valid/Example Values             |
-+===================+=================================+==================+============+==============+=============+=============+===================================+
-| Topicname         | topicname to be created in MR   |     Body         |   String   |     20       |     Y       | Json        | com.att.dmaap.mr.metrics          |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+       
-| topicDescription  | description for topic           |     Body         |   String   |     15       |     Y       |             |                                   |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+  
-| partitionCount    | Kafka topic partition           |     Body         |   String   |     1        |    Y        |             |                                   |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+ 
-| replicationCount  | Kafka topic replication         |     Body         |   String   |     1        |    Y        |             | 3 (Default -for 3 node Kafka )    |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+ 
-| transaction       | to create transaction id for    |     Body         |  Boolean   |     1        |    N        |             | true                              |
-| Enabled           | each message transaction        |                  |            |              |             |             |                                   |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+ 
-| Content-Type      | application/json                |     Header       |   String   |              |             |             | application/json                  |
-+-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
-
-+---------------------------+------------------------------------+
-| Response statusCode       | Response statusMessage             |
-+===========================+====================================+
-| 200-299                   | Success                            |
-+---------------------------+------------------------------------+
-| 400-499                   | the client request has a problem   |
-+---------------------------+------------------------------------+
-| 500-599                   | the DMaaP service has a problem    |
-+---------------------------+------------------------------------+
-
-
-+-------------------------+-----------------+--------------------------------------------------+
-| Error code              |  HTTP Code      |  Description                                     |
-+=========================+=================+==================================================+
-| DMaaP\_MR\_ERR\_5001    | 500             | Failed to retrieve list of all topics            |
-+-------------------------+-----------------+--------------------------------------------------+
-| DMaaP\_MR\_ERR\_5002    | 500             | Failed to retrieve details of topic:<topicName>  |
-+-------------------------+-----------------+--------------------------------------------------+
-| DMaaP\_MR\_ERR\_5003    | 500             | Failed to create topic:<topicName>               |
-+-------------------------+-----------------+--------------------------------------------------+
-| DMaaP\_MR\_ERR\_5004    | 500             | Failed to delete topic:<topicName>               |
-+-------------------------+-----------------+--------------------------------------------------+
-
-
-Response Parameters
-====================
-
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| Name             | Description                    |  Type      | Format       | Valid/Example Values                                      |
-+==================+================================+============+==============+===========================================================+
-| httpStatusCode   |                                |            |              | 200, 201 etc.                                             |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| mrErrorCode      | Numeric error code             |            |              | 5005                                                      |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| errorMessage     |                                |            |              | SUCCESS, or error message.                                |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| helpURL          | helpurl                        |            |              |                                                           |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-| ResponseBody     | Topic details (owner,          |  Json      |  Json        |                                                           |
-|                  | trxEnabled=true)               |            |              |                                                           |
-+------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
-
-
-Sample Request:
-===============
-
-    .. code:: bash
-	
-	    POST   http://<hostname>:3904/topic/create 
-		Request Body  
-		{"topicName":"com.abc.dmaap.mr.topicname","description":"This is a SAPTopic ",
-		"partitionCount":"1","replicationCount":"3","transactionEnabled":"true"}  
-		Content-Type: application/json 
-		Example:
-		curl -u XXXc@csp.abc.com:xxxxx$  -H 'Content-Type:application/json' -X POST -d 
-		@topicname.txt  http://mrlocal00.dcae.proto.research.abc.com:3904/topics/create
-		{  
-		"writerAcl": {   
-		"enabled": false, 
-		"users": []  
-		}, 
-		"description": "This is a TestTopic", 
-		"name": "com.abc.ecomp_test.crm.Load9",   
-		"readerAcl": {  
-		"enabled": false,  
-		"users": [] 
-
-
-GetTopic Details
-----------------
-
-Request URL
-===========
-
-GET http(s)://{HOST:PORT}/topics    : To list the details of all the topics in Message Router.
-
-GET http(s)://{HOST:PORT}/topics/{topicname} : To list the details of specified topic .
-
-Request Parameters
-==================
-
-+--------------------------+-------------------------+------------------+------------+-----------+-------------+-----------------+-----------------------------+
-| Name                     | Description             | Param Type       | Data type  | Max Len   | Required    | Format          | Valid/EXample values        |
-+==========================+=========================+==================+============+===========+=============+=================+=============================+
-| Topicname                | topic name details      | Body             | String     | 20        | Y           |  Json           | com.abc.dmaap.mr.metrics    |
-+--------------------------+-------------------------+------------------+------------+-----------+-------------+-----------------+-----------------------------+
-
-
-Response Parameters
-====================
-
-+------------------+------------------------+------------+----------+---------+--------------------------+
-| Name             | Description            | ParamType  | datatype |Format   | Valid/Example Values     |
-+==================+========================+============+==========+=========+==========================+
-| topicname        |  topic name details    |      Body  |   String |   Json  | com.abc.dmaap.mr.metrics | 
-+------------------+------------------------+------------+----------+---------+--------------------------+
-| description      |                        |            |   String |         |                          | 
-+------------------+------------------------+------------+----------+---------+--------------------------+
-| owner            |user id who created the |            |          |         |                          |
-|                  |         topic          |            |          |         |                          | 
-+------------------+------------------------+------------+----------+---------+--------------------------+
-| txenabled        |     true or false      |            |  boolean |         |                          | 
-+------------------+------------------------+------------+----------+---------+--------------------------+
-
-+---------------------------+------------------------------------+
-| Response statusCode       | Response statusMessage             |
-+===========================+====================================+
-| 200-299                   | Success                            |
-+---------------------------+------------------------------------+
-| 400-499                   | the client request has a problem   |
-+---------------------------+------------------------------------+
-| 500-599                   | the DMaaP service has a problem    |
-+---------------------------+------------------------------------+
-
-
-Sample Request:
-===============
-
-+-----------------------------------------------------------------------------------+
-| GET   http://<hostname>:3904/topic/com.att.dmaap.mr.testtopic                     |
-|       curl -u XXX@csp.abc.com:x$  -X                                              |
-| GET  http://mrlocal00.dcae.proto.research.att.com:3904/topics                     |
-|    {"topics": [                                                                   |
-|    {                                                                              |
-|       "txenabled": true,                                                          |
-|        "description": "This is a TestTopic",                                      |
-|      "owner": "XXXX@csp.abc.com",                                                 |
-|        "topicName": "com.abc.ecomp_test.crm.Load9"                                |
-|    },                                                                             |
-|    {                                                                              |
-|        "txenabled": false,                                                        |
-|        "description": "",                                                         |
-|        "owner": "",                                                               |
-|        "topicName": "com.abc.ecomp_test.crm.Load1"                                |
-|    },                                                                             |
-+-----------------------------------------------------------------------------------+
-
-
-Delete Topics
--------------
-
-Request URL:
-============
-
-DELETE http(s)://{HOST:PORT}/topic/{topicname}
-
-Sample Request:
-===============
-ex: http://<hostname>:3904/dmaap/v1/topics/com.att.dmaap.mr.testopic
-
-+---------------------------+------------------------------------+
-| Response statusCode       | Response statusMessage             |
-+===========================+====================================+
-| 200-299                   | Success                            |
-+---------------------------+------------------------------------+
-| 400-499                   | the client request has a problem   |
-+---------------------------+------------------------------------+
-| 500-599                   | the DMaaP service has a problem    |
-+---------------------------+------------------------------------+
-
-+-------------------------+---------------------------------------------+----------------------+
-| Error code              |    Description                              |HTTP code             |
-+=========================+=============================================+======================+
-|  DMaaP\_MR\_ERR\_5004   |  Failed to delete topic:<topicName>         |   500                |   
-+-------------------------+---------------------------------------------+----------------------+
-
-API Inventory
-------------- 
-
-+-----------+--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           |   API Name         |   API Method                            |   REST API Path                       |                | Comments                         |
-+===========+====================+=========================================+=======================================+================+==================================+
-| Topics    | GetAll Topics      | getTopics()                             | /topics                               | GET            |                                  |
-|           | List               |                                         |                                       |                |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           | Get All Topics     |                                         |                                       |                |                                  |
-|           | List with details  | getAllTopics()                          | /topics/listAll                       | GET            |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           | Get individual     |                                         |                                       |                |                                  |
-|           | Topic Details      | getTopic(String topicName)              | /topics/{topicName}                   | GET            |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           | Create Topic       | createTopic(TopicBean topicBean)        | /topics/create                        | POST           |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           | Delete Topic       | deleteTopicString topicName)            | /topics/{topicName}                   | DELETE         |  Not used in current MR version  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
-|           | Get Publishers     | getPublishersByTopicName                |                                       |                |                                  |
-|           | for a Topic        | String topicName)                       | /topics/{topicName}/producers         | GET            |  UEB Backward Compatibility      |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
-|           | Add a Publisher    | permitPublisherForTopic                 | /topics/{topicName}/producers/        | PUT            |                                  |
-|           | to write ACLon     | (String topicName, String producerId)   | {producerId}                          |                |                                  |
-|           | a Topic            |                                         |                                       |                |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
-|           | Remove a Publisher | denyPublisherForTopic(String topicName, | /topics/{topicName}/producers/        | DELETE         |                                  | 
-|           | from write ACL on  | String producerId)                      | {producerId}                          |                |                                  |
-|           | a Topic            |                                         |                                       |                |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
-|           | Get Consumers for  | getConsumersByTopicName                 | /topics/{topicName}/consumers         |  GET           |                                  |
-|           | a Topic            | (String topicName)                      |                                       |                |                                  |
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
-|           | Add a Consumer     | permitConsumerForTopic(String           | /topics/{topicName}/consumers/        |  PUT           |                                  |
-|           | to read ACL        | topicName,String consumerId)            | {consumerId}                          |                |                                  |
-|           | on a Topic         |                                         |                                       |                |                                  |    
-|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
-|           | Remove a consumer  | denyPublisherForTopic(String topicName, | /topics/{topicName}/consumers/        | DELETE         |                                  | 
-|           | from write         | String consumerId)                      | {consumerId}                          |                |                                  |
-|           | ACL on a Topic     |                                         |                                       |                |                                  |
-+-----------+--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+============================================
+Message Router (MR) API Guide
+============================================
+Architecture
+-------------
+
+In DMaaP Message Router, Restful web service is exposed to client to perform any needed action with Kafka. After getting the request it calls the Message router service layer which is created using AJSC ( AT&T Java Service Container) . AJSC finally calls Kafka services and response is sent back.
+
+   |image0|
+
+   .. |image0| image:: image1.png
+
+
+HTTP Service APIs
+------------------
+
+DMaaP Message Router utilizes an HTTP REST API to service all Publish
+and Consume transactions. HTTP and REST standards are followed so
+clients as varied as CURL, Java applications and even Web Browsers will
+work to interact with Message Router.Message Router uses AAF for user's
+authentication and authorization.
+
+General HTTP Requirements
+=========================
+
+A DMaaP Message Router transactions consists of 4 distinct segments,
+HTTP URL, HTTP Header, HTTP Body (POST) and HTTP Response. The general
+considerations for each segment are as follows and are required for each
+of the specific transactions described in this section.
+
+HTTP URL
+========
+
+http[s]://Username:Password@serverBaseURL{/routing}{resourcePath}
+
+- The Username:Password utilizes HTTP Basic Authentication and HTTPS/TLS to securely transmit the authorization and authentication credentials that AAF needs to validate the client's access to the requested resource.
+
+- The serverBaseURL points to DMaaP Message Router host/port that will service the request. Optionally DME2 service end points for Message Router can be used.
+
+- The resourcePath specifies the specific service, or Topic, that the client is attempting to reach
+
+HTTP Header
+===========
+
+Specifies HTTP Headers, such as Content-Type, that define the parameters
+of the HTTP Transaction
+
+HTTP Body
+=========
+
+The HTTP Body contains the topic content when Publishing or Consuming.
+The Body may contain topic messages in several formats (like below) but
+it must be noted, that, except in very specific circumstances, messages
+are not inspected for content.
+
+
++-------------------------+-----------------------------------------------------------------------------------------------------------------+
+| Content-Type            |  Description                                                                                                    |
++=========================+=================================================================================================================+
+| text/plain              | Each line in the POST body is treated as a separate message. No partition key is specified, and therefore no    |
+|                         | order is guaranteed. This format is mainly for test, as messages are highly likely to be re-ordered when        |
+|                         | delivered through the Kafka cluster.                                                                            |
++-------------------------+-----------------------------------------------------------------------------------------------------------------+
+| application/json        | The payload maybe a single JSON object or a JSON array of JSON objects. Each object is handled as an individual |
+|                         | message..Note that use of this format may result in equivalent but altered JSON objects sent to consumers.      |
+|                         | That's because MR uses a standard JSON parser to read each object into memory before pushing the object to the  |
+|                         | Kafka system. At that point, the JSON object is re-written from the in-memory object. This can result in        |
+|                         | re-ordered fields or changes in whitespace. If you want to preseve JSON objects exactly,                        |
+|                         | use application/cambria. Recommended to follow the JSON format.                                                 |
++-------------------------+-----------------------------------------------------------------------------------------------------------------+
+
+Publishers
+-----------
+
+**Description**:Publishes data to Kafka server on the topic mentioned in the URL.
+Messages will be in the request body
+
+The MessageRouter service has no requirements on what publishers can put
+onto a topic. The messages are opaque to the service and are treated as
+raw bytes. In general, passing JSON messages is preferred, but this is
+due to higher-level features and related systems, not the MessageRouter
+broker itself. The only constraint placed on messages is their on their
+size � messages must be under the maximum size, which is currently
+configured at 1 MB.
+
+Request URL
+===========
+
+POST http(s)://{HOST:PORT}/events/{topicname}
+
+Request Parameters
+==================
+
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+| Name               | Description                  | Param Type       | Data type  | Max Len   | Required    | Format                         | Valid/EXample values        |
++====================+==============================+==================+============+===========+=============+================================+=============================+
+| Topicname          | topic name to be posted      | Path             | String     | 40        | Y           |  <app namespace>.<topicname>   | org.onap.crm.empdetails     |
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+| content-type       | To specify type of message   | Header           | String     | 20        | N           |                                | application/json            |
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+| Username           | userid                       | Header           | String     |           | N           | Basic Authentication Header    |                             |
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+| Password           |                              | Header           | String     |           | N           | Basic Authentication Header    |                             |
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+| partitionKey       |                              | QueryParam       | String     |           | N           | String value                   | ?Partitionkey=123           |
++--------------------+------------------------------+------------------+------------+-----------+-------------+--------------------------------+-----------------------------+
+
+**NOTE**: Publishers/user should have access on the topics. The user (id) and
+permissions details needs to be in AAF.
+
+Response Parameters
+===================
+
++------------------+------------------------+------------+--------------+------------------------------+
+| Name             | Description            | Type       | Format       | Valid/Example Values         |
++==================+========================+============+==============+==============================+
+| httpStatusCode   |                        |            |              | 200, 201 etc.                |
++------------------+------------------------+------------+--------------+------------------------------+
+| mrErrorCode      | Numeric error code     |            |              | 200, 201 etc.                |
++------------------+------------------------+------------+--------------+------------------------------+
+| errorMessage     |                        |            |              | SUCCESS, or error message.   |
++------------------+------------------------+------------+--------------+------------------------------+
+| helpURL          | helpurl                |            |              |                              |
++------------------+------------------------+------------+--------------+------------------------------+
+| transactionid    | transaction-id value   |            |              |                              |
++------------------+------------------------+------------+--------------+------------------------------+
+
+
+
+Response /Error Codes
+=====================
+
++---------------------------+------------------------------------+
+| Response statusCode       |  Response statusMessage            |
++===========================+====================================+
+| 200-299                   | Success                            |
++---------------------------+------------------------------------+
+| 400-499                   | the client request has a problem   |
++---------------------------+------------------------------------+
+| 500-599                   | the DMaaP service has a problem    |
++---------------------------+------------------------------------+
+
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| Error code             |  HTTPCode     |  Description                    | Issue Reason                                                                                            |
++========================+===============+=================================+=========================================================================================================+
+| DMaaP\_MR\_ERR\_3001   | 413           | Request Entity too large        | Message size exceeds the batch limit <limit>.Reduce the batch size and try again                        |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3002   | 500           | Internal Server Error           | Unable to publish messages. Please contact administrator                                                |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3003   | 400           | Bad Request                     | Incorrect Batching format. Please correct the batching format and try again                             |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3004   | 413           | Request Entity too large        | Message size exceeds the message size limit <limit>.Reduce the message size and try again               |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3005   | 400           | Bad Request                     | Incorrect JSON object. Please correct the JSON format and try again                                     |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3006   | 504           | Network Connect Timeout Error   | Connection to the DMaaP MR was timed out.Please try again                                               |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3007   | 500           | Internal Server Error           | Failed to publish  messages to topic <topicName>. Successfully published <count > number of messages.   |
++------------------------+---------------+---------------------------------+---------------------------------------------------------------------------------------------------------+
+
+Sample Request:
+===============
+
++-----------------------------------------------------------------------------------+
+| POST                                                                              |
+|                                                                                   |
+| *Payload-* *{"message":"message description"}* *Content-Type: application/json*   |
+|                                                                                   |
+| Example:                                                                          |
+|                                                                                   |
+| curl -u XXXX@abc.com:X -H 'Content-Type:text/plain' -X POST -d @sampleMsg.txt     |
+|                                                                                   |
+| {    "count": 1,                                                                  |
+|                                                                                   |
+|     "serverTimeMs": 19"                                                           |
+|                                                                                   |
+| }                                                                                 |
++-----------------------------------------------------------------------------------+
+
+Sample Response:
+================
+
++---------------------------------------------------------------------+
+| HTTP/1.1 200 OK                                                     |
+|                                                                     |
+|     Server: Apache-Coyote/1.1                                       |
+|                                                                     |
+|     transactionId: 28-12-2015::08:18:50:682::<IP>::28122015552391   |
+|                                                                     |
+|     Content-Type: application/json                                  |
+|                                                                     |
+|     Content-Length: 42                                              |
+|                                                                     |
+|     Date: Mon, 28 Dec 2015 13:18:50 GMT                             |
++---------------------------------------------------------------------+
+
+
+
+Subscribers
+-----------
+**Description**:To subscribe to a MessageRouter topic, a subscriber issues a GET to the RESTful HTTP endpoint for events.
+
+Request URL:
+============
+
+GET http(s)://{HOST:PORT}}/events/{topicname}/{consumegroup}/{consumerid}/{timeout=x}
+
+Request Parameters:
+===================
+
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| Name         | Description                     |  Param Type      |  data type |   MaxLen     |  Required   |  Format             |  Valid/Example Values  |
++==============+=================================+==================+============+==============+=============+=====================+========================+
+| Topicname    | topic name to be posted         |     Path         |   String   |    40        |     Y       | namespace.String    |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| Consumer     | A name that uniquely identifies |     Path         |   String   |              |     Y       |                     | CG1                    |
+| group        | your subscribers                |                  |            |              |             |                     |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| consumerId   | Within your subscribers group,  |     Path         |   String   |              |     Y       |                     | C1                     |
+|              | a name that uniquely identifies |                  |            |              |             |                     |                        |
+|              | your subscribers  process       |                  |            |              |             |                     |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| content-type | To specify type of message      |     Header       |   String   |     20       |     N       |                     | aplication/json        |
+|              | content(json,text or cambria)   |                  |            |              |             |                     |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| Username     | userid                          |     Header       |   String   |     1        |     N       |                     |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+| Password     |                                 |     Header       |   String   |     1        |     N       |                     |                        |
++--------------+---------------------------------+------------------+------------+--------------+-------------+---------------------+------------------------+
+
+**NOTE1**:Subscribers /user should have access on the topics. The user () and
+permissions details needs to be in AAF.
+
+Response Parameters:
+====================
+
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| Name             | Description                    |  Type      | Format       | Valid/Example Values                                      |
++==================+================================+============+==============+===========================================================+
+| httpStatusCode   |                                |            |              | 200, 201 etc.                                             |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| mrErrorCode      | Numeric error code             |            |              | 200, 201 etc.                                             |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| errorMessage     |                                |            |              | SUCCESS, or error message.                                |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| helpURL          | helpurl                        |            |              |                                                           |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| tranactionid     | transaction-id value           |            |              | 28-12-2015::08:18:50:682::135.25.227.66::28122015552391   |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| ResponseBody     | Messages consumed from topic   | Json       | Json         |                                                           |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+
+
+Response /Error Codes
+=====================
+
+
++---------------------------+------------------------------------+
+| Response statusCode       | Response statusMessage             |
++===========================+====================================+
+| 200-299                   | Success                            |
++---------------------------+------------------------------------+
+| 400-499                   | the client request has a problem   |
++---------------------------+------------------------------------+
+| 500-599                   | the DMaaP service has a problem    |
++---------------------------+------------------------------------+
+
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+| Error code              |  HTTPCode       |  Description               | Issue Reason                                                                                |
++=========================+=================+============================+=============================================================================================+
+| DMaaP\_MR\_ERR\_3008    | 413             | Request Entity too large   | Message size exceeds the batch limit <limit>.Reduce the batch size and try again            |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3009    | 500             | Internal Server Error      | Unable to publish messages. Please contact administartor                                    |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3010    | 400             | Bad Request                | Incorrect Batching format. Please correct the batching format and try again                 |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_3011    | 413             | Request Entity too large   | Message size exceeds the message size limit <limit>.Reduce the message size and try again   |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+| DMaaP\_MR\_ERR\_5012    | 429             | Too many requests          | This client is making too many requests. Please use a long poll setting to decrease the     |
+|                         |                 |                            | number of requests that result in empty responses.                                          |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+|                         | 503             | Service Unavailable        | Service Unavailable.                                                                        |
++-------------------------+-----------------+----------------------------+---------------------------------------------------------------------------------------------+
+
+Sample Request:
+===============
+
++----------------------------------------------------------------------------------------------------+
+| GET  http://<hostname>:3904/events/com.att.dmaap.mr.sprint/mygroup/mycus                           |
+|                                                                                                    |
+| Content-Type: application/json                                                                     |
+|                                                                                                    |
+| Example:                                                                                           |
+|                                                                                                    |
+|curl -u XXX@csp.abc.com:MRDmap2016$ -X GET -d 'MyfirstMessage'                                      |
+|                                                                                                    |
+|http://mrlocal00.dcae.proto.research.att.com:3904/events/com.att.ecomp_test.crm.preDeo/myG/C1       |
+|                                                                                                    |
+|[I am r sending first msg,I am R sending first msg]                                                 |
++----------------------------------------------------------------------------------------------------+
+
+Provisioning
+------------
+**Description**: To create , modify or delete the MessageRouter topics. Generally Invenio application will use these  below apis to create , assign topics to the users. These APIs can also be used by other applications to provision topics in MessageRouter
+
+Create Topic
+============
+Request URL:
+============
+
+POST http(s)://{HOST:PORT}/topics/create
+
+Request Parameters:
+===================
+
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| Name              | Description                     |  Param Type      |  datatype  |   MaxLen     |  Required   |  Format     |  Valid/Example Values             |
++===================+=================================+==================+============+==============+=============+=============+===================================+
+| Topicname         | topicname to be created in MR   |     Body         |   String   |     20       |     Y       | Json        | com.att.dmaap.mr.metrics          |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| topicDescription  | description for topic           |     Body         |   String   |     15       |     Y       |             |                                   |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| partitionCount    | Kafka topic partition           |     Body         |   String   |     1        |    Y        |             |                                   |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| replicationCount  | Kafka topic replication         |     Body         |   String   |     1        |    Y        |             | 3 (Default -for 3 node Kafka )    |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| transaction       | to create transaction id for    |     Body         |  Boolean   |     1        |    N        |             | true                              |
+| Enabled           | each message transaction        |                  |            |              |             |             |                                   |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+| Content-Type      | application/json                |     Header       |   String   |              |             |             | application/json                  |
++-------------------+---------------------------------+------------------+------------+--------------+-------------+-------------+-----------------------------------+
+
++---------------------------+------------------------------------+
+| Response statusCode       | Response statusMessage             |
++===========================+====================================+
+| 200-299                   | Success                            |
++---------------------------+------------------------------------+
+| 400-499                   | the client request has a problem   |
++---------------------------+------------------------------------+
+| 500-599                   | the DMaaP service has a problem    |
++---------------------------+------------------------------------+
+
+
++-------------------------+-----------------+--------------------------------------------------+
+| Error code              |  HTTP Code      |  Description                                     |
++=========================+=================+==================================================+
+| DMaaP\_MR\_ERR\_5001    | 500             | Failed to retrieve list of all topics            |
++-------------------------+-----------------+--------------------------------------------------+
+| DMaaP\_MR\_ERR\_5002    | 500             | Failed to retrieve details of topic:<topicName>  |
++-------------------------+-----------------+--------------------------------------------------+
+| DMaaP\_MR\_ERR\_5003    | 500             | Failed to create topic:<topicName>               |
++-------------------------+-----------------+--------------------------------------------------+
+| DMaaP\_MR\_ERR\_5004    | 500             | Failed to delete topic:<topicName>               |
++-------------------------+-----------------+--------------------------------------------------+
+
+
+Response Parameters
+====================
+
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| Name             | Description                    |  Type      | Format       | Valid/Example Values                                      |
++==================+================================+============+==============+===========================================================+
+| httpStatusCode   |                                |            |              | 200, 201 etc.                                             |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| mrErrorCode      | Numeric error code             |            |              | 5005                                                      |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| errorMessage     |                                |            |              | SUCCESS, or error message.                                |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| helpURL          | helpurl                        |            |              |                                                           |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+| ResponseBody     | Topic details (owner,          |  Json      |  Json        |                                                           |
+|                  | trxEnabled=true)               |            |              |                                                           |
++------------------+--------------------------------+------------+--------------+-----------------------------------------------------------+
+
+
+Sample Request:
+===============
+
+    .. code:: bash
+
+      POST   http://<hostname>:3904/topic/create
+  Request Body
+  {"topicName":"com.abc.dmaap.mr.topicname","description":"This is a SAPTopic ",
+  "partitionCount":"1","replicationCount":"3","transactionEnabled":"true"}
+  Content-Type: application/json
+  Example:
+  curl -u XXXc@csp.abc.com:xxxxx$  -H 'Content-Type:application/json' -X POST -d
+  @topicname.txt  http://mrlocal00.dcae.proto.research.abc.com:3904/topics/create
+  {
+  "writerAcl": {
+  "enabled": false,
+  "users": []
+  },
+  "description": "This is a TestTopic",
+  "name": "com.abc.ecomp_test.crm.Load9",
+  "readerAcl": {
+  "enabled": false,
+  "users": []
+
+
+GetTopic Details
+----------------
+
+Request URL
+===========
+
+GET http(s)://{HOST:PORT}/topics    : To list the details of all the topics in Message Router.
+
+GET http(s)://{HOST:PORT}/topics/{topicname} : To list the details of specified topic .
+
+Request Parameters
+==================
+
++--------------------------+-------------------------+------------------+------------+-----------+-------------+-----------------+-----------------------------+
+| Name                     | Description             | Param Type       | Data type  | Max Len   | Required    | Format          | Valid/EXample values        |
++==========================+=========================+==================+============+===========+=============+=================+=============================+
+| Topicname                | topic name details      | Body             | String     | 20        | Y           |  Json           | com.abc.dmaap.mr.metrics    |
++--------------------------+-------------------------+------------------+------------+-----------+-------------+-----------------+-----------------------------+
+
+
+Response Parameters
+====================
+
++------------------+------------------------+------------+----------+---------+--------------------------+
+| Name             | Description            | ParamType  | datatype |Format   | Valid/Example Values     |
++==================+========================+============+==========+=========+==========================+
+| topicname        |  topic name details    |      Body  |   String |   Json  | com.abc.dmaap.mr.metrics |
++------------------+------------------------+------------+----------+---------+--------------------------+
+| description      |                        |            |   String |         |                          |
++------------------+------------------------+------------+----------+---------+--------------------------+
+| owner            |user id who created the |            |          |         |                          |
+|                  |         topic          |            |          |         |                          |
++------------------+------------------------+------------+----------+---------+--------------------------+
+| txenabled        |     true or false      |            |  boolean |         |                          |
++------------------+------------------------+------------+----------+---------+--------------------------+
+
++---------------------------+------------------------------------+
+| Response statusCode       | Response statusMessage             |
++===========================+====================================+
+| 200-299                   | Success                            |
++---------------------------+------------------------------------+
+| 400-499                   | the client request has a problem   |
++---------------------------+------------------------------------+
+| 500-599                   | the DMaaP service has a problem    |
++---------------------------+------------------------------------+
+
+
+Sample Request:
+===============
+
++-----------------------------------------------------------------------------------------------------------------------------------+
+| GET   http://<hostname>:3904/topic/com.att.dmaap.mr.testtopic                                                                     |
+|       curl -u XXX@csp.abc.com:x$  -X                                                                                              |
+| GET  http://mrlocal00.dcae.proto.research.att.com:3904/topics                                                                     |
+|    {"topics": [                                                                                                                   |
+|    {"txenabled": true,"description": "This is a TestTopic","owner": "XXXX@csp.abc.com","topicName": "com.abc.ecomp_test.crm.Load9"|
+|    {"txenabled": false,"description": "", "owner": "", "topicName": "com.abc.ecomp_test.crm.Load1"                                |
+|    ]},                                                                                                                            |
++-----------------------------------------------------------------------------------------------------------------------------------+
+
+
+Delete Topics
+-------------
+
+Request URL:
+============
+
+DELETE http(s)://{HOST:PORT}/topic/{topicname}
+
+Sample Request:
+===============
+ex: http://<hostname>:3904/dmaap/v1/topics/com.att.dmaap.mr.testopic
+
++---------------------------+------------------------------------+
+| Response statusCode       | Response statusMessage             |
++===========================+====================================+
+| 200-299                   | Success                            |
++---------------------------+------------------------------------+
+| 400-499                   | the client request has a problem   |
++---------------------------+------------------------------------+
+| 500-599                   | the DMaaP service has a problem    |
++---------------------------+------------------------------------+
+
++-------------------------+---------------------------------------------+----------------------+
+| Error code              |    Description                              |HTTP code             |
++=========================+=============================================+======================+
+|  DMaaP\_MR\_ERR\_5004   |  Failed to delete topic:<topicName>         |   500                |
++-------------------------+---------------------------------------------+----------------------+
+
+API Inventory
+-------------
+
++-----------+--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           |   API Name         |   API Method                            |   REST API Path                       |                | Comments                         |
++===========+====================+=========================================+=======================================+================+==================================+
+| Topics    | GetAll Topics      | getTopics()                             | /topics                               | GET            |                                  |
+|           | List               |                                         |                                       |                |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           | Get All Topics     |                                         |                                       |                |                                  |
+|           | List with details  | getAllTopics()                          | /topics/listAll                       | GET            |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           | Get individual     |                                         |                                       |                |                                  |
+|           | Topic Details      | getTopic(String topicName)              | /topics/{topicName}                   | GET            |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           | Create Topic       | createTopic(TopicBean topicBean)        | /topics/create                        | POST           |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           | Delete Topic       | deleteTopicString topicName)            | /topics/{topicName}                   | DELETE         |  Not used in current MR version  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
+|           | Get Publishers     | getPublishersByTopicName                |                                       |                |                                  |
+|           | for a Topic        | String topicName)                       | /topics/{topicName}/producers         | GET            |  UEB Backward Compatibility      |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
+|           | Add a Publisher    | permitPublisherForTopic                 | /topics/{topicName}/producers/        | PUT            |                                  |
+|           | to write ACLon     | (String topicName, String producerId)   | {producerId}                          |                |                                  |
+|           | a Topic            |                                         |                                       |                |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
+|           | Remove a Publisher | denyPublisherForTopic(String topicName, | /topics/{topicName}/producers/        | DELETE         |                                  |
+|           | from write ACL on  | String producerId)                      | {producerId}                          |                |                                  |
+|           | a Topic            |                                         |                                       |                |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
+|           | Get Consumers for  | getConsumersByTopicName                 | /topics/{topicName}/consumers         |  GET           |                                  |
+|           | a Topic            | (String topicName)                      |                                       |                |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
+|           | Add a Consumer     | permitConsumerForTopic(String           | /topics/{topicName}/consumers/        |  PUT           |                                  |
+|           | to read ACL        | topicName,String consumerId)            | {consumerId}                          |                |                                  |
+|           | on a Topic         |                                         |                                       |                |                                  |
+|           +--------------------+-----------------------------------------+---------------------------------------+----------------+                                  |
+|           | Remove a consumer  | denyPublisherForTopic(String topicName, | /topics/{topicName}/consumers/        | DELETE         |                                  |
+|           | from write         | String consumerId)                      | {consumerId}                          |                |                                  |
+|           | ACL on a Topic     |                                         |                                       |                |                                  |
++-----------+--------------------+-----------------------------------------+---------------------------------------+----------------+----------------------------------+
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 6c168cf..099966d 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -50,5 +50,3 @@ Version: x.y.z
 **Deprecation Notes**
 
 **Other**
-
-===========
author	Morgan Richomme <morgan.richomme@orange.com>	2017-11-08 11:37:09 +0100
committer	Morgan Richomme <morgan.richomme@orange.com>	2017-11-08 11:39:01 +0100
commit	43ddc4afac7aafd5f0cd158d7d9c64e7c4597b25 (patch)
tree	671f6e2d335e26e07f29461742373c9b70f8995e /docs
parent	201409190e22128363178c94be43bb32c4021887 (diff)