[camel] branch master updated: [CAMEL-13176] camel yammer component is accessing non-existent page (#2754)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: [CAMEL-13176] camel yammer component is accessing non-existent page (#2754)

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 3af00d6  [CAMEL-13176] camel yammer component is accessing non-existent page (#2754)
3af00d6 is described below

commit 3af00d642326991063e3132b40e60ed2b6a49132
Author: Radovan Netuka <[hidden email]>
AuthorDate: Mon Feb 11 06:58:13 2019 +0100

    [CAMEL-13176] camel yammer component is accessing non-existent page (#2754)
---
 .../camel/component/yammer/YammerEndpoint.java     |   2 -
 .../camel/component/yammer/YammerFunctionType.java |   3 +-
 .../yammer/YammerRelationshipPollingConsumer.java  | 101 ---------------------
 3 files changed, 1 insertion(+), 105 deletions(-)

diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
index 9a13732..3c4afb6 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
@@ -60,8 +60,6 @@ public class YammerEndpoint extends ScheduledPollEndpoint {
         case USERS:
         case CURRENT:
             return new YammerUserPollingConsumer(this, processor);
-        case RELATIONSHIPS:
-            return new YammerRelationshipPollingConsumer(this, processor);
         default:
             throw new Exception(String.format("%s is not a valid Yammer function type.", config.getFunction()));
         }  
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerFunctionType.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerFunctionType.java
index c778960..0bdf229 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerFunctionType.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerFunctionType.java
@@ -18,8 +18,7 @@ package org.apache.camel.component.yammer;
 
 public enum YammerFunctionType {
     MESSAGES, MY_FEED, ALGO, FOLLOWING, SENT, PRIVATE, RECEIVED,
-    USERS, CURRENT,
-    RELATIONSHIPS;
+    USERS, CURRENT;
 
     public static YammerFunctionType fromUri(String uri) {
         for (YammerFunctionType endpointType : YammerFunctionType.values()) {
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerRelationshipPollingConsumer.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerRelationshipPollingConsumer.java
deleted file mode 100644
index 7d72704..0000000
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerRelationshipPollingConsumer.java
+++ /dev/null
@@ -1,101 +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 ASF 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.camel.component.yammer;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.yammer.model.Relationships;
-import org.apache.camel.support.ScheduledPollConsumer;
-import org.apache.camel.util.ObjectHelper;
-import org.codehaus.jackson.map.ObjectMapper;
-
-/**
- * A Yammer consumer that periodically polls relationships from Yammer's relationship API.
- */
-public class YammerRelationshipPollingConsumer extends ScheduledPollConsumer {
-    private final YammerEndpoint endpoint;
-    private final String apiUrl;
-    
-    public YammerRelationshipPollingConsumer(YammerEndpoint endpoint, Processor processor) throws Exception {
-        super(endpoint, processor);
-        this.endpoint = endpoint;
-
-        long delay = endpoint.getConfig().getDelay();
-        setDelay(delay);
-        setTimeUnit(TimeUnit.MILLISECONDS);
-        apiUrl = getApiUrl();
-    }
-
-    private String getApiUrl() throws Exception {    
-        StringBuilder url = new StringBuilder();
-        
-        String function = endpoint.getConfig().getFunction();
-        switch (YammerFunctionType.fromUri(function)) {
-        case RELATIONSHIPS:
-            url.append(YammerConstants.YAMMER_BASE_API_URL);
-            url.append(function);
-            url.append(".json");
-            break;
-        default:
-            throw new Exception(String.format("%s is not a valid Yammer relationship function type.", function));
-        }        
-        
-        StringBuilder args = new StringBuilder();
-        
-        String userId = endpoint.getConfig().getUserId();
-        if (ObjectHelper.isNotEmpty(userId)) {
-            args.append("?user_id=");
-            args.append(userId);
-            url.append(args);
-        }        
-        
-        return url.toString();
-    }
-
-    
-    @Override
-    protected int poll() throws Exception {
-        Exchange exchange = endpoint.createExchange();
-
-        try {
-            String jsonBody = endpoint.getConfig().getRequestor(apiUrl).get();
-
-            if (!endpoint.getConfig().isUseJson()) {
-                ObjectMapper jsonMapper = new ObjectMapper();
-                Relationships relationships = jsonMapper.readValue(jsonBody, Relationships.class);
-                
-                exchange.getIn().setBody(relationships);
-            } else {
-                exchange.getIn().setBody(jsonBody);
-            }
-
-            // send message to next processor in the route
-            getProcessor().process(exchange);
-
-            return 1; // number of messages polled
-        } finally {
-            // log exception if an exception occurred and was not handled
-            if (exchange.getException() != null) {
-                getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
-            }
-        }
-    }
-
-
-}