Skip to content

4.4 merge branch #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbocsi merged 3 commits into from
Jul 22, 2021
Merged

4.4 merge branch #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e0e46
Update DataManagerWSConfig.java
jenseliasson Jul 20, 2021
55734ac
Update DataManagerController.java
jenseliasson Jul 20, 2021
5024bfb
Merge remote-tracking branch 'remotes/eclipse/datamanager' into 4.4-m…
rbocsi Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ public class DataManagerController {
if (!cnVerifier.isValid(systemName)) {
throw new InvalidParameterException(SYSTEM_NAME_WRONG_FORMAT_ERROR_MESSAGE, HttpStatus.SC_BAD_REQUEST, CommonConstants.OP_DATAMANAGER_HISTORIAN);
}

final DataManagerServicesResponseDTO ret = new DataManagerServicesResponseDTO();
final ArrayList<String> services = historianService.getServicesFromSystem(systemName);
ret.setServices(services);
Expand All @@ -150,7 +149,7 @@ public class DataManagerController {
}

//-------------------------------------------------------------------------------------------------
@ApiOperation(value = "Interface to get sensor data from a service", response = SenML.class, responseContainer="Vector", tags = { CoreCommonConstants.SWAGGER_TAG_CLIENT })
@ApiOperation(value = "Interface to get data from a service", response = SenML.class, responseContainer="Vector", tags = { CoreCommonConstants.SWAGGER_TAG_CLIENT })
@ApiResponses (value = {
@ApiResponse(code = HttpStatus.SC_OK, message = CoreCommonConstants.SWAGGER_HTTP_200_MESSAGE),
@ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = CoreCommonConstants.SWAGGER_HTTP_400_MESSAGE),
Expand Down Expand Up @@ -242,7 +241,7 @@ public class DataManagerController {


//-------------------------------------------------------------------------------------------------
@ApiOperation(value = "Interface to put sensor data from a service", tags = { CoreCommonConstants.SWAGGER_TAG_CLIENT })
@ApiOperation(value = "Interface to put data from a service", tags = { CoreCommonConstants.SWAGGER_TAG_CLIENT })
@ApiResponses (value = {
@ApiResponse(code = HttpStatus.SC_OK, message = CoreCommonConstants.SWAGGER_HTTP_200_MESSAGE),
@ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = CoreCommonConstants.SWAGGER_HTTP_400_MESSAGE),
Expand Down Expand Up @@ -292,7 +291,7 @@ public class DataManagerController {
})
@GetMapping(value= CommonConstants.OP_DATAMANAGER_PROXY, produces=MediaType.APPLICATION_JSON_VALUE)
@ResponseBody public DataManagerSystemsResponseDTO proxyGet() {
logger.debug("proxyGet ...");
logger.debug("proxyGet");

final DataManagerSystemsResponseDTO ret = new DataManagerSystemsResponseDTO();

Expand Down
2 changes: 2 additions & 0 deletions datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerWSConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class DataManagerWSConfig implements WebSocketConfigurer {
@Autowired
private HistorianWSHandler historianWSHandler;

//-------------------------------------------------------------------------------------------------
@Override
public void registerWebSocketHandlers(final WebSocketHandlerRegistry webSocketHandlerRegistry) {
if (websocketsEnabled) {
Expand All @@ -59,6 +60,7 @@ public void registerWebSocketHandlers(final WebSocketHandlerRegistry webSocketHa
}
}

//-------------------------------------------------------------------------------------------------
@Bean
public HandshakeInterceptor auctionInterceptor() {
return new HandshakeInterceptor() {
Expand Down