[karaf-decanter] branch master updated: [KARAF-6295] Avoid confusion between rest collector and rest-servlet collector

[jb...@apache.org]

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git


The following commit(s) were added to refs/heads/master by this push:
     new 697a236  [KARAF-6295] Avoid confusion between rest collector and rest-servlet collector
     new f17f0d0  Merge pull request #88 from fpapon/KARAF-6295
697a236 is described below

commit 697a23654e87de0c585f9f82f8df5f85bdb9e87e
Author: Francois Papon <fr...@openobject.fr>
AuthorDate: Sat May 25 18:46:38 2019 +0400

    [KARAF-6295] Avoid confusion between rest collector and rest-servlet collector
---
 collector/rest-servlet/pom.xml                                 |  2 +-
 .../{RestCollector.java => servlet/RestServletCollector.java}  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/collector/rest-servlet/pom.xml b/collector/rest-servlet/pom.xml
index cd81639..ce13f1c 100644
--- a/collector/rest-servlet/pom.xml
+++ b/collector/rest-servlet/pom.xml
@@ -64,7 +64,7 @@
                             *
                         </Import-Package>
                         <Private-Package>
-                            org.apache.karaf.decanter.collector.rest,
+                            org.apache.karaf.decanter.collector.rest.servlet,
                             org.apache.karaf.decanter.collector.utils
                         </Private-Package>
                         <_dsannotations>*</_dsannotations>
diff --git a/collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java b/collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/servlet/RestServletCollector.java
similarity index 91%
rename from collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
rename to collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/servlet/RestServletCollector.java
index a18ea91..23e91ea 100644
--- a/collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
+++ b/collector/rest-servlet/src/main/java/org/apache/karaf/decanter/collector/rest/servlet/RestServletCollector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.decanter.collector.rest;
+package org.apache.karaf.decanter.collector.rest.servlet;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
     immediate = true,
     property = { "decanter.collector.name=rest-servlet", "alias=/decanter/collect" }
 )
-public class RestCollector extends HttpServlet {
+public class RestServletCollector extends HttpServlet {
 
     @Reference
     public EventAdmin dispatcher;
@@ -57,7 +57,7 @@ public class RestCollector extends HttpServlet {
     @Reference
     public Unmarshaller unmarshaller;
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(RestCollector.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(RestServletCollector.class);
 
     private String baseTopic;
     private Dictionary<String, Object> properties;
@@ -66,7 +66,7 @@ public class RestCollector extends HttpServlet {
     @Activate
     public void activate(ComponentContext context) throws MalformedURLException {
         Dictionary<String, Object> props = context.getProperties();
-        this.baseTopic = getProperty(props, "topic", "decanter/collect/rest");
+        this.baseTopic = getProperty(props, "topic", "decanter/collect/rest-servlet");
         this.properties = props;
     }
 
@@ -77,6 +77,7 @@ public class RestCollector extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
+        LOGGER.debug("Karaf Decanter REST Servlet Collector request received from {}", req.getRequestURI());
         try {
             Map<String, Object> data = unmarshaller.unmarshal(req.getInputStream());
             data.put("type", "restservlet");
@@ -95,6 +96,7 @@ public class RestCollector extends HttpServlet {
             Event event = new Event(baseTopic, data);
             dispatcher.postEvent(event);
             resp.setStatus(HttpServletResponse.SC_CREATED);
+            LOGGER.debug("Karaf Decanter REST Servlet Collector harvesting done");
         } catch (Exception e) {
             resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             LOGGER.warn("Error processing event from servlet", e);