Skip to content

Commit

Permalink
Merge master into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Jul 12, 2021
2 parents 2388d53 + 8f68896 commit dc755f2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ developer-based questions can be submitted on **Stack Overflow** using the FIWAR
- [Testing](#testing)
- [Contributing](#willing-to-contribute-your-technology-to-fiware)
- [License](#license)

</details>

</details>

Expand Down
2 changes: 1 addition & 1 deletion core/scorpio
Submodule scorpio updated 43 files
+44 −0 Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/DBWriteTemplates.java
+2 −1 Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/UpdateHistoryEntityRequest.java
+1 −1 Commons/src/main/java/eu/neclab/ngsildbroker/commons/interfaces/NotificationHandler.java
+76 −44 Commons/src/main/java/eu/neclab/ngsildbroker/commons/ldcontext/ContextResolverBasic.java
+67 −34 Commons/src/main/java/eu/neclab/ngsildbroker/commons/storage/StorageReaderDAO.java
+154 −74 Commons/src/main/java/eu/neclab/ngsildbroker/commons/storage/StorageWriterDAO.java
+0 −153 Commons/src/main/java/eu/neclab/ngsildbroker/commons/tenant/TenantAwareDataSource.java
+0 −14 Commons/src/main/java/eu/neclab/ngsildbroker/commons/tenant/TenantContext.java
+15 −0 Commons/src/main/java/eu/neclab/ngsildbroker/commons/tools/HttpUtils.java
+7 −0 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/EntityHandler.java
+30 −43 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/config/EntityJdbcConfig.java
+15 −44 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/services/EntityInfoDAO.java
+30 −118 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/services/EntityService.java
+0 −202 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/services/StorageWriterDAO.java
+1 −3 Core/EntityManager/src/test/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityControllerTest.java
+27 −4 Core/QueryManager/src/main/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryController.java
+16 −8 Core/QueryManager/src/main/java/eu/neclab/ngsildbroker/queryhandler/services/QueryService.java
+2 −0 ...tionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/controller/SubscriptionController.java
+7 −7 ...iptionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/service/BaseNotificationHandler.java
+1 −1 ...onManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/service/IntervalNotificationHandler.java
+12 −53 ...bscriptionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/service/SubscriptionInfoDAO.java
+161 −137 ...bscriptionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/service/SubscriptionService.java
+1 −5 History/HistoryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/config/HistoryJdbcConfig.java
+7 −1 History/HistoryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/controller/HistoryController.java
+3 −2 History/HistoryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/repository/HistoryDAO.java
+2 −1 History/HistoryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/service/HistoryService.java
+1 −1 History/HistoryManager/src/test/java/eu/neclab/ngsildbroker/historymanager/service/HistoryServiceTest.java
+13 −1 RELEASENOTES
+0 −7 Registry/RegistryManager/src/main/java/eu/neclab/ngsildbroker/registryhandler/config/RegistryJdbcConfig.java
+21 −56 Registry/RegistryManager/src/main/java/eu/neclab/ngsildbroker/registryhandler/repository/CSourceInfoDAO.java
+29 −86 Registry/RegistryManager/src/main/java/eu/neclab/ngsildbroker/registryhandler/service/CSourceService.java
+0 −4 ...RegistryManager/src/test/java/eu/neclab/ngsildbroker/registryhandler/controller/RegistryControllerTest.java
+9 −10 Registry/RegistryManager/src/test/java/eu/neclab/ngsildbroker/registryhandler/service/CSourceServiceTest.java
+0 −7 Storage/StorageManager/src/main/java/eu/neclab/ngsildbroker/storagemanager/config/JdbcConfig.java
+8 −3 Storage/StorageManager/src/main/java/eu/neclab/ngsildbroker/storagemanager/controller/InfoController.java
+7 −4 ...e/StorageManager/src/main/java/eu/neclab/ngsildbroker/storagemanager/repository/EntityStorageReaderDAO.java
+0 −6 Storage/StorageManager/src/main/java/eu/neclab/ngsildbroker/storagemanager/services/StorageWriterService.java
+ docs/en/source/figures/Tenant1.png
+ docs/en/source/figures/Tenant_Flow_Digram.png
+ docs/en/source/figures/ngb.png
+1 −0 docs/en/source/index.rst
+55 −0 docs/en/source/multiTenant.rst
+17 −13 docs/roadmap.md

0 comments on commit dc755f2

Please sign in to comment.