Merge "Reorder the modifiers"

[aai/champ.git] / src / main / java / org / onap / aai / champ / event / AbstractLoggingChampGraph.java

diff --git a/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java
index 30fd414..cb2f5a7 100644 (file)
--- a/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java
@@ -74,15 +74,20 @@ public abstract class AbstractLoggingChampGraph implements ChampGraph {
   @Override
   public abstract Optional<ChampRelationship>      retrieveRelationship(Object key) throws ChampUnmarshallingException;
   public abstract void                             executeDeleteRelationship(ChampRelationship relationship) throws ChampRelationshipNotExistsException;
+  @Override
   public abstract Stream<ChampRelationship>        retrieveRelationships(ChampObject object) throws ChampUnmarshallingException, ChampObjectNotExistsException;
+  @Override
   public abstract Stream<ChampRelationship>        queryRelationships(Map<String, Object> queryParams);
   public abstract ChampPartition                   executeStorePartition(ChampPartition partition) throws ChampSchemaViolationException, ChampRelationshipNotExistsException, ChampMarshallingException, ChampObjectNotExistsException;
   public abstract void                             executeDeletePartition(ChampPartition graph);
   public abstract void                             executeStoreObjectIndex(ChampObjectIndex index);
+  @Override
   public abstract Optional<ChampObjectIndex>       retrieveObjectIndex(String indexName);
+  @Override
   public abstract Stream<ChampObjectIndex>         retrieveObjectIndices();
   public abstract void                             executeDeleteObjectIndex(String indexName) throws ChampIndexNotExistsException;
   public abstract void                             executeStoreRelationshipIndex(ChampRelationshipIndex index);
+  @Override
   public abstract Optional<ChampRelationshipIndex> retrieveRelationshipIndex(String indexName);
   public abstract Stream<ChampRelationshipIndex>   retrieveRelationshipIndices();
   public abstract void                             executeDeleteRelationshipIndex(String indexName) throws ChampIndexNotExistsException;
@@ -100,12 +105,12 @@ public abstract class AbstractLoggingChampGraph implements ChampGraph {
   
   /** Configuration property for setting the number of events that we will try to 'batch' 
    *  up before sending them to the event bus. */
-  public final static String  PARAM_EVENT_STREAM_BATCH_SIZE = "champ.event.stream.batch-size";
+  public static final String  PARAM_EVENT_STREAM_BATCH_SIZE = "champ.event.stream.batch-size";
   public final static Integer DEFAULT_EVENT_STREAM_BATCH_SIZE = 1;
   
   /** Configuration property for setting the maximum amount of time to wait for a batch of
    *  outgoing messages to fill up before sending the batch. */
-  public final static String  PARAM_EVENT_STREAM_BATCH_TIMEOUT = "champ.event.stream.batch-timeout";
+  public static final String  PARAM_EVENT_STREAM_BATCH_TIMEOUT = "champ.event.stream.batch-timeout";
   public final static Integer DEFAULT_EVENT_STREAM_BATCH_TIMEOUT_MS = 500; 
   
   public final static String  PARAM_EVENT_STREAM_PUBLISHER_POOL_SIZE = "champ.event.stream.publisher-pool-size";