[aries-journaled-events] branch master updated: Fix compile error

[cs...@apache.org]

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

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git


The following commit(s) were added to refs/heads/master by this push:
     new f5c2ba0  Fix compile error
f5c2ba0 is described below

commit f5c2ba09e1090696ea7cb695104833b6cce7b3aa
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Sun Jan 6 18:31:05 2019 +0100

    Fix compile error
---
 .../aries/events/mongo/MessageReceiverImpl.java    |  2 +-
 .../apache/aries/events/mongo/MongoMessage.java    | 45 ----------------------
 .../apache/aries/events/mongo/MongoMessaging.java  | 20 +++-------
 3 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MessageReceiverImpl.java b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MessageReceiverImpl.java
index b2e4b19..2bf838f 100644
--- a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MessageReceiverImpl.java
+++ b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MessageReceiverImpl.java
@@ -127,7 +127,7 @@ final class MessageReceiverImpl implements MessageReceiver {
                 if (idx == startIndex + i) {
                     Binary payload = document.get(PAYLOAD, Binary.class);
                     Map<String, String> props = (Map<String, String>) document.get(Fields.PROPS);
-                    Message message = new MongoMessage(payload.getData(), props);
+                    Message message = new Message(payload.getData(), props);
                     collected.add(message);
                 } else {
                     if (i == 0) {
diff --git a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessage.java b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessage.java
deleted file mode 100644
index 5f47327..0000000
--- a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The SF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package org.apache.aries.events.mongo;
-
-import org.apache.aries.events.api.Message;
-
-import java.util.Map;
-
-class MongoMessage implements Message {
-
-    private byte[] payload;
-    private Map<String, String> properties;
-
-    MongoMessage(byte[] payload, Map<String, String> props) {
-	this.payload = payload;
-	properties = props;
-    }
-
-    @Override
-    public byte[] getPayload() {
-	return this.payload;
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-	return this.properties;
-    }
-
-}
diff --git a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
index a3747eb..96bca0c 100644
--- a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
+++ b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
@@ -25,8 +25,8 @@ import com.mongodb.client.MongoDatabase;
 import org.apache.aries.events.api.Message;
 import org.apache.aries.events.api.Messaging;
 import org.apache.aries.events.api.Position;
-import org.apache.aries.events.api.Received;
-import org.apache.aries.events.api.Seek;
+import org.apache.aries.events.api.SubscribeRequestBuilder;
+import org.apache.aries.events.api.SubscribeRequestBuilder.SubscribeRequest;
 import org.apache.aries.events.api.Subscription;
 import org.bson.Document;
 import org.osgi.service.component.annotations.Activate;
@@ -34,9 +34,7 @@ import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.metatype.annotations.Designate;
 
-import java.util.Map;
 import java.util.Optional;
-import java.util.function.Consumer;
 
 import static org.apache.aries.events.mongo.Common.DEFAULT_DB_NAME;
 import static org.apache.aries.events.mongo.MongoPosition.index;
@@ -58,17 +56,11 @@ public class MongoMessaging implements Messaging {
     }
 
     @Override
-    public Subscription subscribe(
-	    String topic, Position position, Seek seek, Consumer<Received> callback
-    ) {
-        MongoCollection<Document> collection = database.getCollection(topic);
+    public Subscription subscribe(SubscribeRequestBuilder requestBuilder) {
+        SubscribeRequest request = requestBuilder.build();
+        MongoCollection<Document> collection = database.getCollection(request.getTopic());
         MessageReceiver receiver = messageReceiver(collection);
-        return subscription(receiver, index(position), seek, callback);
-    }
-
-    @Override
-    public Message newMessage(byte[] payload, Map<String, String> props) {
-        return new MongoMessage(payload, props);
+        return subscription(receiver, index(request.getPosition()), request.getSeek(), request.getCallback());
     }
 
     @Override