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

Extract exchange from URI

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

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

@@ -3,6 +3,8 @@
*/ */
package org.eclipse.hawkbit.amqp; package org.eclipse.hawkbit.amqp;
import java.net.URI;
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;
@@ -55,4 +57,8 @@ public class BaseAmqpService {
return (T) messageConverter.fromMessage(message); return (T) messageConverter.fromMessage(message);
} }
protected String getExchangeFromAmqpUri(final URI amqpUri) {
return amqpUri.getPath().substring(1);
}
} }

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

@@ -23,7 +23,7 @@ public class DefaultAmqpSenderService extends BaseAmqpService implements AmqpSen
@Override @Override
public void sendMessage(final Message message, final URI uri) { public void sendMessage(final Message message, final URI uri) {
spInternalConnectorTemplate.send(uri.getPath(), message); spInternalConnectorTemplate.send(getExchangeFromAmqpUri(uri), message);
} }
} }

3
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/IpUtil.java
View File

@@ -108,8 +108,7 @@ public final class IpUtil {
* If the given string not parsable * If the given string not parsable
*/ */
public static URI createAmqpUri(final String virtualHost, final String exchange) { public static URI createAmqpUri(final String virtualHost, final String exchange) {
// TODO check return createUri(AMPQP_SCHEME, virtualHost).resolve("/" + exchange);
return createUri(AMPQP_SCHEME, virtualHost).resolve(exchange);
} }
/** /**

2
hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java
View File

@@ -121,7 +121,7 @@ public class IpUtilTest {
assertFalse(IpUtil.isHttpUri(amqpUri)); assertFalse(IpUtil.isHttpUri(amqpUri));
assertEquals(host, amqpUri.getHost()); assertEquals(host, amqpUri.getHost());
assertEquals("amqp", amqpUri.getScheme()); assertEquals("amqp", amqpUri.getScheme());
assertEquals("path", amqpUri.getPath()); assertEquals("/path", amqpUri.getRawPath());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)