Couchbase module #688
Couchbase module #688
Conversation
modules/couchbase/README.md
Outdated
|
|
||
| ### Special consideration | ||
|
|
||
| Couchbase testContainer is configured to use random available [ports](https://developer.couchbase.com/documentation/server/current/install/install-ports.html) for some ports only, as [Couchbase Java SDK](https://developer.couchbase.com/documentation/server/current/sdk/java/start-using-sdk.html) permit to configure only some ports : |
There was a problem hiding this comment.
FYI we usually use just word "container"
|
|
||
| dependencies { | ||
| compile project(':testcontainers') | ||
| compile 'com.couchbase.client:java-client:2.5.7' |
There was a problem hiding this comment.
Couchbase java client is actually used, so if the client doesn't add this library, it won't run.
It is also used in test, it will force me to add testCompile.
|
|
||
| /** | ||
| * Based on Laurent Doguin version | ||
| * <p> |
| private String urlBase; | ||
|
|
||
| public CouchbaseContainer() { | ||
| super("couchbase/server:latest"); |
There was a problem hiding this comment.
could you please fix the version?
|
|
||
| public void callCouchbaseRestAPI(String url, String payload) throws IOException { | ||
| String fullUrl = urlBase + url; | ||
| HttpURLConnection httpConnection = (HttpURLConnection) ((new URL(fullUrl).openConnection())); |
There was a problem hiding this comment.
please wrap with try-with-resources
| * @author ctayeb | ||
| * Created on 06/06/2017 | ||
| */ | ||
| public class CouchbaseQueryServiceWaitStrategy extends GenericContainer.AbstractWaitStrategy { |
There was a problem hiding this comment.
We have a new base class not based on GenericContainer.AbstractWaitStrategy, could you please use it?
| retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> { | ||
| getRateLimiter().doWhenReady(() -> { | ||
| try { | ||
| final HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection(); |
There was a problem hiding this comment.
try-with-resources please, otherwise will leak
| abstract class AbstractCouchbaseWaitStrategy extends AbstractWaitStrategy { | ||
|
|
||
| CouchbaseContainer getContainer() { | ||
| return (CouchbaseContainer) waitStrategyTarget; |
There was a problem hiding this comment.
It doesn't have to be an instance of CouchbaseContainer (checked the usages), the same strategy could be used for Docker Compose
There was a problem hiding this comment.
Yes, I'm aware of that, but I didn't find a better solution, I need the container in implemented classes, which was available in the previous implementation of AbstractWaitStrategy. And in my case it is always a CouchbaseContainer.
There was a problem hiding this comment.
Why would you need a ref to CouchbaseContainer?
There was a problem hiding this comment.
To get the container ip address and logger. otherwise I need to add them in constructor.
I'll check this tonight because pushing to github is blocked at work.
There was a problem hiding this comment.
you get containerIp from WaitStrategyTarget interface.
Logger - I would rather prefer to create it inside the strategy, i.e. with @Slf4j annotation
There was a problem hiding this comment.
Ok, will do ASAP. Thanks!
|
Hi @tchlyah, |
| * optimized by Tayeb Chlyah | ||
| */ | ||
| @AllArgsConstructor | ||
| public class CouchbaseContainer<SELF extends CouchbaseContainer<SELF>> extends GenericContainer<SELF> { |
There was a problem hiding this comment.
Since this is a final container, you can use:
class CouchbaseContainer extends GenericContainer<CouchbaseContainer>
| * | ||
| * optimized by Tayeb Chlyah | ||
| */ | ||
| @AllArgsConstructor |
There was a problem hiding this comment.
Yes, it is needed for lombok @Wither
| @Override | ||
| public void start() { | ||
| super.start(); | ||
| if (!newBuckets.isEmpty()) { |
There was a problem hiding this comment.
containerIsStarted is probably a better method to do this
There was a problem hiding this comment.
Yes indeed. For the record, I never tried to optimize the original code, just make it work 😉
There was a problem hiding this comment.
Ah, ok, sorry :) Thanks for changing it 👍
| * created on 18/07/16. | ||
| */ | ||
| @Slf4j | ||
| public class CouchbaseWaitStrategy extends AbstractWaitStrategy { |
There was a problem hiding this comment.
I have a feeling that this class can be removed or dramatically simplified by using HttpWaitStrategy + responsePredicate :)
There was a problem hiding this comment.
Yes you are absolutely right, I'm doing it now!
|
@tchlyah merged, thanks! Sorry for taking so long 🙏 |
Move Couchbase module to main repo : #564 & #269