Skip to content

Commit

Permalink
Fix internal server error on subscription
Browse files Browse the repository at this point in the history
The subscription manager implicitly requires the at context server
to work, which was deactivated before. Now it is activated.
In addition an endpoint was secured with RBAC.

Signed-off-by: Meric Feyzullahoglu <[email protected]>
  • Loading branch information
MericFeyz committed Jul 10, 2024
1 parent 7dd6302 commit 68f36d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions AllInOneRunner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<artifactId>all-in-one-runner</artifactId>
<name>AllInOneRunner</name>
<dependencies>
<!-- <dependency>
<dependency>
<groupId>eu.neclab.ngsildbroker</groupId>
<artifactId>at-context-server</artifactId>
<version>${parent.version}</version>
</dependency> -->
</dependency>
<dependency>
<groupId>eu.neclab.ngsildbroker</groupId>
<artifactId>entity-manager</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ public Uni<RestResponse<Object>> deleteMultiple(HttpServerRequest request, Strin
}
@POST
@Path("/merge")
@RolesAllowed({"Factory-Admin", "Factory-Editor", "Factory-Writer"})
public Uni<RestResponse<Object>> mergeMultiple(HttpServerRequest request,
List<Map<String, Object>> compactedEntities, @QueryParam(value = "options") String options,
@QueryParam("localOnly") boolean localOnly) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<modules>
<module>BrokerParent</module>
<module>Commons</module>
<!-- <module>at-context-server</module> -->
<module>at-context-server</module>
<module>EntityManager</module>
<module>QueryManager</module>
<module>SubscriptionManager</module>
Expand Down

0 comments on commit 68f36d8

Please sign in to comment.