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

Add JavaDoc and refactor staff for clean code convention

Browse Source 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-02-16 09:22:54 +01:00
parent 91dfbbd3a6
commit be68ad32f5
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
View File

@@ -12,7 +12,6 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -71,10 +70,8 @@ import com.google.common.eventbus.EventBus;
/** /**
* *
* {@link AmqpMessageHandlerService} handles all incoming AMQP messages. * {@link AmqpMessageHandlerService} handles all incoming AMQP messages for the
* * queue which is configure for the property hawkbit.dmf.rabbitmq.receiverQueue.
*
*
* *
*/ */
public class AmqpMessageHandlerService extends BaseAmqpService { public class AmqpMessageHandlerService extends BaseAmqpService {
@@ -211,11 +208,6 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
return artifact; return artifact;
} }
protected void logAndThrowMessageError(final Message message, final String error) {
LOG.error("Error \"{}\" reported by message {}", error, message.getMessageProperties().getMessageId());
throw new IllegalArgumentException(error);
}
private static void setSecurityContext(final Authentication authentication) { private static void setSecurityContext(final Authentication authentication) {
final SecurityContextImpl securityContextImpl = new SecurityContextImpl(); final SecurityContextImpl securityContextImpl = new SecurityContextImpl();
securityContextImpl.setAuthentication(authentication); securityContextImpl.setAuthentication(authentication);
@@ -230,15 +222,6 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
setSecurityContext(authenticationToken); setSecurityContext(authenticationToken);
} }
private String getStringHeaderKey(final Message message, final String key, final String errorMessageIfNull) {
final Map<String, Object> header = message.getMessageProperties().getHeaders();
final Object value = header.get(key);
if (value == null) {
logAndThrowMessageError(message, errorMessageIfNull);
}
return value.toString();
}
/** /**
* Method to create a new target or to find the target if it already exists. * Method to create a new target or to find the target if it already exists.
* *

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

@@ -22,8 +22,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties("hawkbit.dmf.rabbitmq") @ConfigurationProperties("hawkbit.dmf.rabbitmq")
public class AmqpProperties { public class AmqpProperties {
private String deadLetterQueue = "dmf_connector_deadletter"; private String deadLetterQueue = "dmf_receiver_deadletter";
private String deadLetterExchange = "dmf.connector.deadletter"; private String deadLetterExchange = "dmf.receiver.deadletter";
private String receiverQueue = "dmf_receiver"; private String receiverQueue = "dmf_receiver";
private boolean missingQueuesFatal = false; private boolean missingQueuesFatal = false;

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

@@ -4,18 +4,21 @@
package org.eclipse.hawkbit.amqp; package org.eclipse.hawkbit.amqp;
import java.net.URI; import java.net.URI;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.support.converter.AbstractJavaTypeMapper; import org.springframework.amqp.support.converter.AbstractJavaTypeMapper;
import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.MessageConverter;
/** /**
* @author Dennis Melzer
* *
*/ */
public class BaseAmqpService { public class BaseAmqpService {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseAmqpService.class);
protected static final String VIRTUAL_HOST_MESSAGE_HEADER = "VHOST_HEADER"; protected static final String VIRTUAL_HOST_MESSAGE_HEADER = "VHOST_HEADER";
protected MessageConverter messageConverter; protected MessageConverter messageConverter;
@@ -61,4 +64,18 @@ public class BaseAmqpService {
return amqpUri.getPath().substring(1); return amqpUri.getPath().substring(1);
} }
protected String getStringHeaderKey(final Message message, final String key, final String errorMessageIfNull) {
final Map<String, Object> header = message.getMessageProperties().getHeaders();
final Object value = header.get(key);
if (value == null) {
logAndThrowMessageError(message, errorMessageIfNull);
}
return value.toString();
}
protected void logAndThrowMessageError(final Message message, final String error) {
LOGGER.error("Error \"{}\" reported by message {}", error, message.getMessageProperties().getMessageId());
throw new IllegalArgumentException(error);
}
} }