lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into

Browse Source 
Download_server_supports_download_through_HTTP_and_HTTPs

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2016-04-05 11:58:27 +02:00
parent ef38712729 50c9141f77
commit df1d4c5a20
230 changed files with 3626 additions and 5973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpSenderService.java
View File

@@ -24,10 +24,10 @@ public interface AmqpSenderService {
*
* @param message
* the amqp message
* @param uri
* @param replyTo
* the reply to uri
*/
void sendMessage(Message message, URI uri);
void sendMessage(Message message, URI replyTo);
/**
* Extract the exchange from the uri. Default implementation removes the

10
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
View File

@@ -59,7 +59,7 @@ public class BaseAmqpService {
*/
@SuppressWarnings("unchecked")
public <T> T convertMessage(final Message message, final Class<T> clazz) {
if (message == null || message.getBody() == null) {
if (isMessageBodyEmpty(message)) {
return null;
}
message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,
@@ -67,6 +67,10 @@ public class BaseAmqpService {
return (T) rabbitTemplate.getMessageConverter().fromMessage(message);
}
private boolean isMessageBodyEmpty(final Message message) {
return message == null || message.getBody() == null || message.getBody().length == 0;
}
/**
* Is needed to convert a incoming message to is originally list object
* type.
@@ -79,7 +83,7 @@ public class BaseAmqpService {
*/
@SuppressWarnings("unchecked")
public <T> List<T> convertMessageList(final Message message, final Class<T> clazz) {
if (message == null || message.getBody() == null) {
if (isMessageBodyEmpty(message)) {
return Collections.emptyList();
}
message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,
@@ -105,7 +109,7 @@ public class BaseAmqpService {
}
protected final void logAndThrowMessageError(final Message message, final String error) {
LOGGER.error("Error \"{}\" reported by message {}", error, message.getMessageProperties().getMessageId());
LOGGER.warn("Error \"{}\" reported by message: {}", error, message);
throw new IllegalArgumentException(error);
}

9
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java
View File

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.amqp;
import java.net.URI;
import org.eclipse.hawkbit.util.IpUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -33,8 +34,12 @@ public class DefaultAmqpSenderService implements AmqpSenderService {
}
@Override
public void sendMessage(final Message message, final URI uri) {
internalAmqpTemplate.send(extractExchange(uri), null, message);
public void sendMessage(final Message message, final URI replyTo) {
if (!IpUtil.isAmqpUri(replyTo)) {
return;
}
internalAmqpTemplate.send(extractExchange(replyTo), null, message);
}
}