SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove TODOs

Browse Source
This commit is contained in:
Eric Bottard
2015-12-18 16:28:12 +01:00
parent de2463a4e6
commit 286ba44ff1
12 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/WindowingOffsetManager.java
View File

@@ -21,12 +21,6 @@ import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.kafka.core.Partition;
import org.springframework.integration.kafka.listener.OffsetManager;
import org.springframework.util.Assert;
import rx.Observable;
import rx.Subscription;
import rx.functions.Action0;
@@ -39,6 +33,12 @@ import rx.subjects.PublishSubject;
import rx.subjects.SerializedSubject;
import rx.subjects.Subject;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.kafka.core.Partition;
import org.springframework.integration.kafka.listener.OffsetManager;
import org.springframework.util.Assert;
/**
* An {@link OffsetManager} that aggregates writes over a time or count window, using an underlying delegate to
* do the actual operations. Its purpose is to reduce the performance impact of writing operations
@@ -48,7 +48,6 @@ import rx.subjects.Subject;
*
* @author Marius Bogoevici
*/
//TODO: Move this class to spring-integration-kafka
public class WindowingOffsetManager implements OffsetManager, InitializingBean, DisposableBean {
private final CreatePartitionAndOffsetFunction createPartitionAndOffsetFunction = new CreatePartitionAndOffsetFunction();

7
spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTests.java
View File

@@ -29,6 +29,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import kafka.api.OffsetRequest;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
@@ -47,8 +48,6 @@ import org.springframework.integration.kafka.listener.MessageListener;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import kafka.api.OffsetRequest;
/**
* Integration tests for the {@link KafkaMessageChannelBinder}.
@@ -312,11 +311,11 @@ public class KafkaBinderTests extends PartitionCapableBinderTests {
binder.unbindConsumers("foo" + uniqueBindingId + ".0");
}
@Override @Ignore // TODO
@Override @Ignore("https://github.com/spring-cloud/spring-cloud-stream/issues/243")
public void testSendAndReceivePubSub() throws Exception {
}
@Override @Ignore // TODO
@Override @Ignore("https://github.com/spring-cloud/spring-cloud-stream/issues/243")
public void createInboundPubSubBeforeOutboundPubSub() throws Exception {
}

7
spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java
View File

@@ -18,6 +18,9 @@ package org.springframework.cloud.stream.binder.kafka;
import java.util.List;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Registration;
import org.springframework.cloud.stream.binder.AbstractTestBinder;
import org.springframework.cloud.stream.test.junit.kafka.KafkaTestSupport;
import org.springframework.cloud.stream.test.junit.kafka.TestKafkaCluster;
@@ -28,9 +31,6 @@ import org.springframework.integration.codec.kryo.PojoCodec;
import org.springframework.integration.kafka.support.ZookeeperConnect;
import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Registration;
/**
* Test support class for {@link KafkaMessageChannelBinder}.
@@ -79,7 +79,6 @@ public class KafkaTestBinder extends AbstractTestBinder<KafkaMessageChannelBinde
return new PojoCodec(new TupleRegistrar());
}
//TODO: temporary wrapper for compatibility with SI Codec types
private static class TupleRegistrar implements KryoRegistrar {
private final TupleKryoRegistrar delegate = new TupleKryoRegistrar();

1
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/ConnectionFactorySettings.java
View File

@@ -43,7 +43,6 @@ public class ConnectionFactorySettings {
private Resource sslPropertiesLocation;
@Bean
// TODO: Move to spring boot
public ConnectionFactory rabbitConnectionFactory(RabbitProperties config,
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory) throws Exception {
CachingConnectionFactory factory = new CachingConnectionFactory(rabbitConnectionFactory);

1
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java
View File

@@ -56,7 +56,6 @@ public class RabbitBindingCleaner implements BindingCleaner {
user == null ? "guest" : user,
pw == null ? "guest" : pw,
vhost == null ? "/" : vhost,
//TODO: Change prefix
binderPrefix == null ? BINDER_PREFIX : binderPrefix,
entity, isJob);
}

6
spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/RedisBinderTests.java
View File

@@ -88,10 +88,10 @@ public class RedisBinderTests extends PartitionCapableBinderTests {
@Override
@Test
@Ignore // TODO
@Ignore("https://github.com/spring-cloud/spring-cloud-stream/issues/247")
public void testSendAndReceivePubSub() throws Exception {
TimeUnit.SECONDS.sleep(2); //TODO remove timing issue
//TimeUnit.SECONDS.sleep(2);
super.testSendAndReceivePubSub();
}
@@ -352,7 +352,7 @@ public class RedisBinderTests extends PartitionCapableBinderTests {
assertTrue(headers.contains("bar"));
}
@Override @Ignore // TODO
@Override @Ignore("https://github.com/spring-cloud/spring-cloud-stream/issues/247")
public void createInboundPubSubBeforeOutboundPubSub() throws Exception {
}

6
spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java
View File

@@ -25,6 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Registration;
import org.junit.Before;
import org.junit.Test;
@@ -44,9 +46,6 @@ import org.springframework.xd.tuple.Tuple;
import org.springframework.xd.tuple.TupleBuilder;
import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Registration;
/**
* @author Gary Russell
* @author David Turanski
@@ -297,7 +296,6 @@ public class MessageChannelBinderSupportTests {
}
}
//TODO: temporary wrapper for compatibility with SI Codec types
private static class TupleRegistrar implements KryoRegistrar {
private final TupleKryoRegistrar delegate = new TupleKryoRegistrar();

1
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java
View File

@@ -145,7 +145,6 @@ public class ModuleLauncher {
jarURLs.add(jarFileArchive.getUrl());
for (Archive archive : jarFileArchive.getNestedArchives(ArchiveMatchingEntryFilter.FILTER)) {
// avoid duplication based on unique JAR names
// TODO - read the metadata from the JARs, do proper version resolution on merge
String urlAsString = archive.getUrl().toString();
String jarNameWithExtension = urlAsString.substring(0, urlAsString.lastIndexOf("!/"));
String jarNameWithoutExtension =

2
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/MultiArchiveLauncher.java
View File

@@ -18,7 +18,6 @@ package org.springframework.cloud.stream.module.launcher;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -65,7 +64,6 @@ public class MultiArchiveLauncher extends Launcher {
}
@Override
// TODO: this method is protected in Spring Boot but we need it to be public here
public void launch(String[] args) {
super.launch(args);
}

27
spring-cloud-stream-tuple/src/test/java/org/springframework/cloud/stream/tuple/DefaultTupleTestForBatch.java
View File

@@ -16,17 +16,6 @@
package org.springframework.cloud.stream.tuple;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
@@ -38,6 +27,18 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.springframework.cloud.stream.tuple.TupleBuilder.tuple;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException;
/**
* This is a port of the FieldSet tests from Spring Batch
*
@@ -317,7 +318,6 @@ public class DefaultTupleTestForBatch {
tuple.getBigDecimal(index);
fail("field value is not a number, exception expected");
}
// TODO - in batch this used to be IllegalArgumentException (which is the nested exception type now)
catch (ConversionFailedException e) {
assertTrue(e.getMessage().indexOf("TestString") > 0);
}
@@ -332,8 +332,6 @@ public class DefaultTupleTestForBatch {
}
catch (ConversionFailedException e) {
assertTrue(e.getMessage().indexOf("TestString") > 0);
// TODO - in batch this is part of the message, indicating what the name of the field is...
// assertTrue(e.getMessage().indexOf("name: [String]") > 0);
}
}
@@ -382,7 +380,6 @@ public class DefaultTupleTestForBatch {
}
catch (ConversionFailedException e) {
assertTrue(e.getMessage().indexOf("TestString") > 0);
// TODO - in batch this is part of the message, indicating what the name of the field is...
// assertTrue(e.getMessage().indexOf("name: [String]") > 0);
}

3
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/ModuleAggregationTest.java
View File

@@ -35,8 +35,7 @@ import org.springframework.context.ConfigurableApplicationContext;
/**
* @author Marius Bogoevici
*/
// TODO re-enable once we can test with a Mock binder
@Ignore
@Ignore("https://github.com/spring-cloud/spring-cloud-stream/issues/241")
public class ModuleAggregationTest {
@Test

2
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/local/LocalMessageChannelBinder.java
View File

@@ -272,7 +272,6 @@ public class LocalMessageChannelBinder extends MessageChannelBinderSupport {
Properties properties) {
validateConsumerProperties(name, properties, CONSUMER_REQUEST_REPLY_PROPERTIES);
final MessageChannel requestChannel = this.findOrCreateRequestReplyChannel(name, "requestor.", properties);
// TODO: handle Pollable ?
Assert.isInstanceOf(SubscribableChannel.class, requests);
((SubscribableChannel) requests).subscribe(new MessageHandler() {
@@ -305,7 +304,6 @@ public class LocalMessageChannelBinder extends MessageChannelBinderSupport {
}
});
// TODO: handle Pollable ?
Assert.isInstanceOf(SubscribableChannel.class, replies);
final SubscribableChannel replyChannel = this.findOrCreateRequestReplyChannel(name, "replier.", properties);
((SubscribableChannel) replies).subscribe(new MessageHandler() {