Revert "Renamed files http consumer, provider and http file consumer"

This reverts commit 960a206.
assemblee-virtuelle · Dec 18, 2023 · daa945c · daa945c
1 parent 960a206
commit daa945c
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 44 deletions.
diff --git a/engine/services/technicalComponentDirectory.js b/engine/services/technicalComponentDirectory.js
@@ -12,8 +12,7 @@ module.exports = {
     cacheNosql: require('../workspaceComponentExecutor/cacheNosql.js'),
     gouvFrInverseGeo: require('../workspaceComponentExecutor/gouvFrInverseGeo.js'),
     restApiGet: require('../workspaceComponentExecutor/restApiGet.js'),
-    restApiPost: require('../workspaceComponentExecutor/httpProvider.js'),
-    httpProvider: require('../workspaceComponentExecutor/httpProvider.js'),
+    restApiPost: require('../workspaceComponentExecutor/restApiPost.js'),
     // xmlToObject: require('./workspaceComponentExecutor/xmlToObject.js'),
     framcalcGetCsv: require('../workspaceComponentExecutor/framcalcGetCsv.js'),
     gouvFrGeoLocaliser: require('../workspaceComponentExecutor/gouvFrGeoLocaliser.js'),
@@ -23,8 +22,7 @@ module.exports = {
     filter: require('../workspaceComponentExecutor/filter.js'),
     upload: require('../workspaceComponentExecutor/upload.js'),
     scrapper: require('../workspaceComponentExecutor/scrapper/scrapper.js'),
-    httpGet: require('../workspaceComponentExecutor/httpFileConsumer.js'),
-    httpFileConsumer: require('../workspaceComponentExecutor/httpFileConsumer.js'),
+    httpGet: require('../workspaceComponentExecutor/restGetFile.js'),
     sqlConnector: require('../workspaceComponentExecutor/sqlConnecteur.js'),
     mongoConnector: require('../workspaceComponentExecutor/MongoDB.js'),
     influxdbConnector: require('../workspaceComponentExecutor/influxdb.js'),
@@ -35,8 +33,7 @@ module.exports = {
     valueFromPath: require('../workspaceComponentExecutor/valueFromPath.js'),
     unicity: require('../workspaceComponentExecutor/unicity.js'),
     propertiesMatrix: require('../workspaceComponentExecutor/propertiesMatrix.js'),
-    postConsumer: require('../workspaceComponentExecutor/httpConsumer.js'),
-    httpConsumer: require('../workspaceComponentExecutor/httpConsumer.js'),
+    postConsumer: require('../workspaceComponentExecutor/postConsumer.js'),
     keyToArray: require('../workspaceComponentExecutor/keyToArray.js'),
     sftpConsumer: require('../workspaceComponentExecutor/sftpConsumer.js'),
     flat: require('../workspaceComponentExecutor/flat.js'),

diff --git a/...orkspaceComponentExecutor/httpConsumer.js → ...orkspaceComponentExecutor/postConsumer.js b/...orkspaceComponentExecutor/httpConsumer.js → ...orkspaceComponentExecutor/postConsumer.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const https = require('https');
 const fileLib = require('../../core/lib/file_lib.js')
 
-class HttpConsumer {
+class PostConsumer {
   constructor () {
     this.fetch = require('node-fetch');
     this.stringReplacer = require('../utils/stringReplacer.js');
@@ -298,4 +298,4 @@ class HttpConsumer {
   }
 }
 
-module.exports = new HttpConsumer()
+module.exports = new PostConsumer()
diff --git a/...orkspaceComponentExecutor/httpProvider.js → ...workspaceComponentExecutor/restApiPost.js b/...orkspaceComponentExecutor/httpProvider.js → ...workspaceComponentExecutor/restApiPost.js
@@ -1,8 +1,8 @@
 'use strict'
-class HttpProvider {
+class RestApiPost {
   constructor () {
     this.stepNode = false
-    this.workspace_component_lib = require('../../core/lib/workspace_component_lib.js')
+    this.workspace_component_lib = require('../../core/lib/workspace_component_lib')
     this.data2xml = require('data2xml')
     this.dataTraitment = require('../../core/dataTraitmentLibrary/index.js')
     this.json2yaml = require('json2yaml')
@@ -22,4 +22,4 @@ class HttpProvider {
   }
 }
 
-module.exports = new HttpProvider()
+module.exports = new RestApiPost()
diff --git a/...paceComponentExecutor/httpFileConsumer.js → ...workspaceComponentExecutor/restGetFile.js b/...paceComponentExecutor/httpFileConsumer.js → ...workspaceComponentExecutor/restGetFile.js
@@ -1,5 +1,5 @@
 'use strict';
-class HttpFileConsumer {
+class HttpGet {
   constructor () {
     this.url = require('url')
     this.http = require('http')
@@ -68,4 +68,4 @@ class HttpFileConsumer {
     return this.makeRequest('GET', data.specificData.url, data.specificData.contentType,flowdata, pullParams)
   }
 }
-module.exports = new HttpFileConsumer()
+module.exports = new HttpGet()
diff --git a/main/client/static/application.html b/main/client/static/application.html
@@ -111,7 +111,7 @@
   <script type="riot/tag" src="tag/editorComponents/dataFlow/framacalc-get-csv-editor.tag"></script>
   <script type="riot/tag" src="tag/editorComponents/dataFlow/google-get-json-editor.tag"></script>
   <script type="riot/tag" src="tag/editorComponents/dataFlow/rest-api-post-editor.tag"></script>
-  <script type="riot/tag" src="tag/editorComponents/dataFlow/http-consumer-editor.tag"></script>
+  <script type="riot/tag" src="tag/editorComponents/dataFlow/post-consumer-editor.tag"></script>
 
   <script type="riot/tag" src="tag/editorComponents/files/upload-editor.tag"></script>
   <script type="riot/tag" src="tag/editorComponents/files/rest-get-editor.tag"></script>

diff --git a/...ponents/dataFlow/http-consumer-editor.tag → ...ponents/dataFlow/post-consumer-editor.tag b/...ponents/dataFlow/http-consumer-editor.tag → ...ponents/dataFlow/post-consumer-editor.tag
@@ -1,4 +1,4 @@
-<http-consumer-editor>
+<post-consumer-editor>
   <!-- bouton aide -->
   <div class="contenaireH" style="margin-left:97%">
     <a href="https://github.com/assemblee-virtuelle/Semantic-Bus/wiki/Composant:-HTTP-Consumer" target="_blank"><img src="./image/help.png" alt="Aide" width="25px" height="25px"></a>
@@ -165,4 +165,4 @@
     display: none;
   }
   </style>
-</http-consumer-editor>
+</post-consumer-editor>
diff --git a/...ponents/dataFlow/http-provider-editor.tag → ...ponents/dataFlow/rest-api-post-editor.tag b/...ponents/dataFlow/http-provider-editor.tag → ...ponents/dataFlow/rest-api-post-editor.tag
@@ -1,4 +1,4 @@
-<http-provider-editor>
+<rest-api-post-editor>
   <!-- bouton aide -->
   <div class="contenaireH" style="margin-left:97%">
     <a href="https://github.com/assemblee-virtuelle/Semantic-Bus/wiki/Composant:-HTTP-Provider" target="_blank"><img src="./image/help.png" alt="Aide" width="25px" height="25px"></a>
@@ -131,4 +131,4 @@
       color:rgb(180,180,180);
     }
   </style>
-</http-provider-editor>
+</rest-api-post-editor>
diff --git a/...nents/files/http-file-consumer-editor.tag → ...ditorComponents/files/rest-get-editor.tag b/...nents/files/http-file-consumer-editor.tag → ...ditorComponents/files/rest-get-editor.tag
@@ -1,4 +1,4 @@
-<http-file-consumer-editor>
+<rest-get-editor>
   <!-- bouton aide -->
   <div class="containerH" style="margin-left:97%">
     <a href="https://github.com/assemblee-virtuelle/Semantic-Bus/wiki/Composant:-File-consumer" target="_blank"><img src="./image/help.png" alt="Aide" width="25px" height="25px"></a>

diff --git a/main/server/services/technicalComponentDirectory.js b/main/server/services/technicalComponentDirectory.js
@@ -12,8 +12,7 @@ module.exports = {
   cacheNosql: require('../workspaceComponentInitialize/cacheNosql.js'),
   gouvFrInverseGeo: require('../workspaceComponentInitialize/gouvFrInverseGeo.js'),
   restApiGet: require('../workspaceComponentInitialize/restApiGet.js'),
-  restApiPost: require('../workspaceComponentInitialize/httpProvider.js'),
-  httpProvider: require('../workspaceComponentInitialize/httpProvider.js'),
+  restApiPost: require('../workspaceComponentInitialize/restApiPost.js'),
   // xmlToObject: require('./workspaceComponentInitialize/xmlToObject.js'),
   framcalcGetCsv: require('../workspaceComponentInitialize/framcalcGetCsv.js'),
   gouvFrGeoLocaliser: require('../workspaceComponentInitialize/gouvFrGeoLocaliser.js'),
@@ -23,8 +22,7 @@ module.exports = {
   filter: require('../workspaceComponentInitialize/filter.js'),
   upload: require('../workspaceComponentInitialize/upload.js'),
   scrapper: require('../workspaceComponentInitialize/scrapper.js'),
-  httpGet: require('../workspaceComponentInitialize/httpFileConsumer.js'),
-  httpFileConsumer: require('../workspaceComponentInitialize/httpFileConsumer.js'),
+  httpGet: require('../workspaceComponentInitialize/restGetFile.js'),
   sqlConnector: require('../workspaceComponentInitialize/sqlConnecteur.js'),
   mongoConnector: require('../workspaceComponentInitialize/MongoDB.js'),
   influxdbConnector: require('../workspaceComponentInitialize/influxdb.js'),
@@ -35,8 +33,7 @@ module.exports = {
   valueFromPath: require('../workspaceComponentInitialize/valueFromPath.js'),
   unicity: require('../workspaceComponentInitialize/unicity.js'),
   propertiesMatrix: require('../workspaceComponentInitialize/propertiesMatrix.js'),
-  postConsumer: require('../workspaceComponentInitialize/httpConsumer.js'),
-  httpConsumer: require('../workspaceComponentInitialize/httpConsumer.js'),
+  postConsumer: require('../workspaceComponentInitialize/postConsumer.js'),
   keyToArray: require('../workspaceComponentInitialize/keyToArray.js'),
   sftpConsumer: require('../workspaceComponentInitialize/sftpConsumer.js'),
   flat: require('../workspaceComponentInitialize/flat.js'),
@@ -67,17 +64,17 @@ module.exports = {
     return directory
   },
 
-  initialise: function (router, unSafeRouteur, engineTracer) {
+  initialise: function (router, unSafeRouteur,engineTracer) {
     // console.log('initialise')
-    this.httpProvider.initialise(unSafeRouteur, engineTracer) // NO SECURE CHANGE ROUTER
-    this.restApiGet.initialise(unSafeRouteur, engineTracer) // NO SECURE CHANGE ROUTER
-    this.upload.initialise(router, engineTracer)
-    this.cacheNosql.initialise(router, engineTracer) // NO SECURE CHANGE ROUTER
+    this.restApiPost.initialise(unSafeRouteur,engineTracer) // NO SECURE CHANGE ROUTER
+    this.restApiGet.initialise(unSafeRouteur,engineTracer) // NO SECURE CHANGE ROUTER
+    this.upload.initialise(router,engineTracer)
+    this.cacheNosql.initialise(router,engineTracer) // NO SECURE CHANGE ROUTER
   },
 
-  setAmqp: function (channel) {
+  setAmqp : function (channel){
     // console.log('setAmqp')
-    this.httpProvider.setAmqp(channel)
+    this.restApiPost.setAmqp(channel);
     this.upload.setAmqp(channel)
   }
 }
diff --git a/...kspaceComponentInitialize/httpConsumer.js → ...kspaceComponentInitialize/postConsumer.js b/...kspaceComponentInitialize/httpConsumer.js → ...kspaceComponentInitialize/postConsumer.js
@@ -1,9 +1,9 @@
 'use strict';
-class HttpConsumer {
+class PostConsumer {
   constructor () {
     this.type = 'HTTP consumer'
     this.description = 'Appeler une API HTTP; Executer une requête HTTP.'
-    this.editor = 'http-consumer-editor'
+    this.editor = 'post-consumer-editor'
     this.graphIcon = 'Post_consumer.svg'
     this.tags = [
       'http://semantic-bus.org/data/tags/outComponents',
@@ -13,4 +13,4 @@ class HttpConsumer {
   }
 }
 
-module.exports = new HttpConsumer()
+module.exports = new PostConsumer()
diff --git a/...kspaceComponentInitialize/httpProvider.js → ...rkspaceComponentInitialize/restApiPost.js b/...kspaceComponentInitialize/httpProvider.js → ...rkspaceComponentInitialize/restApiPost.js
@@ -2,7 +2,7 @@
 
 const { v4: uuidv4 } = require('uuid');
 const MODE = 'AMQP' // MODE could be AMQP when all workflow will migrate over V1
-class HttpProvider {
+class RestApiPost {
   constructor() {
     this.type = 'HTTP provider'
     this.description = `Mettre à disposition une API HTTP; Permettre à votre workflow d'être appelé par une requete HTTP.`
@@ -14,9 +14,9 @@ class HttpProvider {
         'http://semantic-bus.org/data/tags/APIComponents'
       ],
       this.stepNode = false
-    this.workspace_component_lib = require('../../../core/lib/workspace_component_lib.js')
-    this.workspace_lib = require('../../../core/lib/workspace_lib.js')
-    this.fragment_lib = require('../../../core/lib/fragment_lib.js')
+    this.workspace_component_lib = require('../../../core/lib/workspace_component_lib')
+    this.workspace_lib = require('../../../core/lib/workspace_lib')
+    this.fragment_lib = require('../../../core/lib/fragment_lib')
     this.data2xml = require('data2xml');
     this.xmlJS = require('xml-js');
     this.dataTraitment = require('../../../core/dataTraitmentLibrary/index.js')
@@ -294,4 +294,4 @@ class HttpProvider {
   }
 }
 
-module.exports = new HttpProvider()
+module.exports = new RestApiPost()
diff --git a/...ceComponentInitialize/httpFileConsumer.js → ...rkspaceComponentInitialize/restGetFile.js b/...ceComponentInitialize/httpFileConsumer.js → ...rkspaceComponentInitialize/restGetFile.js
@@ -1,14 +1,14 @@
 'use strict';
-class HttpFileConsumer {
+class HttpGet {
   constructor () {
-    this.type = 'HTTP File Consumer'
+    this.type = 'File consumer'
     this.description = 'Interroger un fichier mis à disposition sur une API REST avec une requete GET.'
-    this.editor = 'http-file-consumer-editor'
+    this.editor = 'rest-get-editor'
     this.graphIcon = 'File_consumer.svg'
     this.tags = [
       'http://semantic-bus.org/data/tags/inComponents',
       'http://semantic-bus.org/data/tags/fileComponents'
     ]
   }
 }
-module.exports = new HttpFileConsumer()
+module.exports = new HttpGet()