Merge remote-tracking branch 'origin/Scheduler' into Scheduler

# Conflicts: # docker/wildfly/volumes/conf/beuthbot.properties # services/Common/src/main/java/de/bht/beuthbot/model/Intent.java # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java # settings.gradle

Merge remote-tracking branch 'origin/Scheduler' into Scheduler
# Conflicts: # docker/wildfly/volumes/conf/beuthbot.properties # services/Common/src/main/java/de/bht/beuthbot/model/Intent.java # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java # settings.gradle
mfcb
2 parents fae0497c ada5a8e7
Showing 7 changed files with 86 additions and 16 deletions
docker/wildfly/volumes/conf/beuthbot.properties
services/FaceBook/build.gradle
services/FaceBook/src/main/java/de/bht/beuthbot/messenger/facebook/FacebookReceiveAdapter.java
services/JSONRequester/build.gradle
services/JSONRequester/src/main/java/de/bht/beuthbot/JSONRequester/JSONRequester.java
services/Telegram/build.gradle
settings.gradle
-WEB_URL = https://wcwettfhwr.localtunnel.me
+WEB_URL = https://tlhiuqrvbl.localtunnel.me
  
  
 # Webhook token you set in the Facebook App Settings
-FACEBOOK_WEBHOOK_TOKEN = bhtchatbot
+FACEBOOK_WEBHOOK_TOKEN = local-beuth-bot
  
 # Facebook Message Token for your page
-FACEBOOK_BOT_TOKEN = XXXXX
-
-FACEBOOK_ACCESS_TOKEN = XXXXX|XXXXX-XXXXX
+FACEBOOK_BOT_TOKEN = EAAX3bENbCzcBAGESpNG7XBqXiZBvOzwX7quURCwBlzpjFuWyd0JH8HFUrhmu167IjWBMPcSki8ZCtZAZBR0CS4ZAV1r4nAZCqayLZAbPxvJVIxVw0NHm9gG7f6qahc18Wh0IZCKkTUqYLPfGbZAbAUMHsbAAcbZBeTbBmVS6ydHtxLyvSCwXJgh1ob
  
+FACEBOOK_ACCESS_TOKEN = 1679419242122039|XVLpgA2YMXcwWQCg1Sj_hGKuNwM
  
  
 # API.ai client token
@@ -18,10 +17,9 @@ API_AI_TOKEN = XXXXX
 # Your WebHook URL e.g.: https://yourdomain.com/webhook/
 TELEGRAM_WEBHOOK_URL = /telegram/getUpdates
  
-
 # Your Bot Token e.g.: 000000000:AAAAa0aAA_aaA-Aaaa0A0Aa_a0aa0A0AAAA
-TELEGRAM_BOT_TOKEN = 451726698:AAH2qwZaWOgn1IU1CjJU-HjHDMODG6DEkN0
-        
+TELEGRAM_BOT_TOKEN = 452768505:AAHNXEYi9nSHcmVc4b3799I00uTZmK53wl4\
+          
  
  
 BING_SPEECH_LOCALE = global
@@ -2,26 +2,24 @@ apply plugin: &#39;java&#39;
 apply plugin: 'war'
 apply plugin: 'checkstyle'
  
+sourceCompatibility = 1.8
+
 repositories {
     mavenCentral()
 }
  
 dependencies {
-
     compile project(':services:Common'),
             "org.jboss.spec:jboss-javaee-7.0:1.1.0.Final",
             "org.apache.httpcomponents:httpclient:4.5.3",
             "org.apache.httpcomponents:httpmime:4.3.1",
             "org.json:json:20160810"
-
     providedCompile "org.slf4j:slf4j-api:1.7.25",
                     "org.jboss.resteasy:resteasy-client:3.1.3.Final",
                     "org.jboss.resteasy:resteasy-jaxrs-all:3.1.3.Final"
  
 }
  
-sourceCompatibility = 1.8
-
 war {
     destinationDir new File(project.rootProject.projectDir, 'docker/wildfly/volumes/deployments/')
     archiveName "facebook.war"
@@ -106,7 +106,6 @@ public class FacebookReceiveAdapter {
                 processQueue.route(new TaskMessage(facebookBotMessage));
  
             }
-
         }
  
         return "\nReceived\n";
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'checkstyle'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':services:Common'),
+            "org.jboss.spec:jboss-javaee-7.0:1.1.0.Final",
+            "org.apache.httpcomponents:httpclient:4.5.3",
+            "org.apache.httpcomponents:httpmime:4.3.1",
+            "org.json:json:20160810"
+    providedCompile "org.slf4j:slf4j-api:1.7.25",
+                    "org.jboss.resteasy:resteasy-client:3.1.3.Final",
+                    "org.jboss.resteasy:resteasy-jaxrs-all:3.1.3.Final"
+}
+
+war {
+    destinationDir new File(project.rootProject.projectDir, 'docker/wildfly/volumes/deployments/')
+    archiveName "jsonrequester.war"
+}
 \ No newline at end of file
+package de.bht.beuthbot.JSONRequester;
+
+import de.bht.beuthbot.attachments.AttachmentStore;
+import de.bht.beuthbot.jms.ProcessQueue;
+import javafx.application.Application;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
+@Singleton
+@Startup
+public class JSONRequester {
+
+    //private final Logger logger = LoggerFactory.getLogger(JSONRequester.class);
+
+    /** Injected JMS MessageQueue */
+    @Resource(lookup = "java:global/global/ProcessQueueBean")
+    private ProcessQueue processQueue;
+
+    /** Injected AttachmentStore */
+    @Resource(lookup = "java:global/global/AttachmentStoreBean")
+    private AttachmentStore attachmentStore;
+
+    /** BeuthBot Application Bean */
+    @Resource(lookup = "java:global/global/ApplicationBean")
+    private Application application;
+
+    //CONSTRUCTOR
+    @PostConstruct
+    public void init(){
+        //logger.debug("JSONRequester initiated!");
+    }
+
+    public String getJSONForURL(de.bht.beuthbot.JSONRequester.JSONRequestObject requestObject) {
+        //ResteasyClient client = new ResteasyClientBuilder().build();
+        //ResteasyWebTarget target = client.target(UriBuilder.fromPath(requestObject.getRequestUrl()));
+        //JSONRequestInterface jsonProxy = target.proxy(JSONRequestInterface.class);
+
+        //Response response = jsonProxy.sendRequest();
+
+        //String responseAsString = response.readEntity(String.class);
+
+        return "";
+    }
+}
@@ -2,6 +2,8 @@ apply plugin: &#39;java&#39;
 apply plugin: 'war'
 apply plugin: 'checkstyle'
  
+sourceCompatibility = 1.8
+
 repositories {
     mavenCentral()
 }
@@ -20,8 +22,6 @@ dependencies {
  
 }
  
-sourceCompatibility = 1.8
-
 war {
     destinationDir new File(project.rootProject.projectDir, 'docker/wildfly/volumes/deployments/')
     archiveName "telegram.war"
@@ -8,6 +8,9 @@ include (
         'services:MainBot',
         'services:LoggingStatistics',
         'services:Telegram',
-        'services:Scheduler'
+        'services:Scheduler',
+        'services:JSONRequester'
 )
+//findProject(':services:Scheduler')?.name = 'Scheduler'
+//findProject(':services:JSONRequester')?.name = 'JSONRequester'