-
Notifications
You must be signed in to change notification settings - Fork 26
Add TestContainers sample for Doma Spring Boot #310
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
2a0f96f
Add TestContainers sample for Doma Spring Boot (Fixes #290)
devin-ai-integration[bot] 448f356
Revise TestContainers sample to use Spring Boot's native TestContaine…
devin-ai-integration[bot] 5198bb1
Fix code formatting issues
devin-ai-integration[bot] 1e42f72
Update TestContainers sample to use Spring Initializr generated approach
devin-ai-integration[bot] 06610a1
Remove old TestContainersConfig.java file
devin-ai-integration[bot] 45661c4
Update TestContainers sample based on feedback: use RestClient, remov…
devin-ai-integration[bot] 87b5535
Update TestContainers sample based on feedback: remove explicit diale…
devin-ai-integration[bot] 237ea2d
Change page and size parameters to integers in ApplicationTest
devin-ai-integration[bot] 487094d
Update transaction manager logging to use JdbcTransactionManager
devin-ai-integration[bot] 2a5fa14
Use diamond operator for ParameterizedTypeReference
devin-ai-integration[bot] ccf7bfc
Add Maven wrapper info to README and remove redundant application-tes…
devin-ai-integration[bot] ccbf51f
Add Maven wrapper files to TestContainers sample
devin-ai-integration[bot] cf62c8e
Address PR comments: add SQL logging, remove useless comment, remove …
devin-ai-integration[bot] 5f6bdc4
Remove JUnit comment from pom.xml
devin-ai-integration[bot] 5f5aa9a
Remove TestContainers comment from pom.xml
devin-ai-integration[bot] 37dc226
Remove PostgreSQL Driver comment and fix README.md to remove H2 refer…
devin-ai-integration[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
117 changes: 117 additions & 0 deletions
117
...t-samples/doma-spring-boot-sample-testcontainers/.mvn/wrapper/MavenWrapperDownloader.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* | ||
| * Copyright 2007-present the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import java.net.*; | ||
| import java.io.*; | ||
| import java.nio.channels.*; | ||
| import java.util.Properties; | ||
|
|
||
| public class MavenWrapperDownloader { | ||
|
|
||
| private static final String WRAPPER_VERSION = "0.5.6"; | ||
| /** | ||
| * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. | ||
| */ | ||
| private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" | ||
| + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; | ||
|
|
||
| /** | ||
| * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to | ||
| * use instead of the default one. | ||
| */ | ||
| private static final String MAVEN_WRAPPER_PROPERTIES_PATH = | ||
| ".mvn/wrapper/maven-wrapper.properties"; | ||
|
|
||
| /** | ||
| * Path where the maven-wrapper.jar will be saved to. | ||
| */ | ||
| private static final String MAVEN_WRAPPER_JAR_PATH = | ||
| ".mvn/wrapper/maven-wrapper.jar"; | ||
|
|
||
| /** | ||
| * Name of the property which should be used to override the default download url for the wrapper. | ||
| */ | ||
| private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; | ||
|
|
||
| public static void main(String args[]) { | ||
| System.out.println("- Downloader started"); | ||
| File baseDirectory = new File(args[0]); | ||
| System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); | ||
|
|
||
| // If the maven-wrapper.properties exists, read it and check if it contains a custom | ||
| // wrapperUrl parameter. | ||
| File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); | ||
| String url = DEFAULT_DOWNLOAD_URL; | ||
| if(mavenWrapperPropertyFile.exists()) { | ||
| FileInputStream mavenWrapperPropertyFileInputStream = null; | ||
| try { | ||
| mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); | ||
| Properties mavenWrapperProperties = new Properties(); | ||
| mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); | ||
| url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); | ||
| } catch (IOException e) { | ||
| System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); | ||
| } finally { | ||
| try { | ||
| if(mavenWrapperPropertyFileInputStream != null) { | ||
| mavenWrapperPropertyFileInputStream.close(); | ||
| } | ||
| } catch (IOException e) { | ||
| // Ignore ... | ||
| } | ||
| } | ||
| } | ||
| System.out.println("- Downloading from: " + url); | ||
|
|
||
| File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); | ||
| if(!outputFile.getParentFile().exists()) { | ||
| if(!outputFile.getParentFile().mkdirs()) { | ||
| System.out.println( | ||
| "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); | ||
| } | ||
| } | ||
| System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); | ||
| try { | ||
| downloadFileFromURL(url, outputFile); | ||
| System.out.println("Done"); | ||
| System.exit(0); | ||
| } catch (Throwable e) { | ||
| System.out.println("- Error downloading"); | ||
| e.printStackTrace(); | ||
| System.exit(1); | ||
| } | ||
| } | ||
|
|
||
| private static void downloadFileFromURL(String urlString, File destination) throws Exception { | ||
| if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { | ||
| String username = System.getenv("MVNW_USERNAME"); | ||
| char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); | ||
| Authenticator.setDefault(new Authenticator() { | ||
| @Override | ||
| protected PasswordAuthentication getPasswordAuthentication() { | ||
| return new PasswordAuthentication(username, password); | ||
| } | ||
| }); | ||
| } | ||
| URL website = new URL(urlString); | ||
| ReadableByteChannel rbc; | ||
| rbc = Channels.newChannel(website.openStream()); | ||
| FileOutputStream fos = new FileOutputStream(destination); | ||
| fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); | ||
| fos.close(); | ||
| rbc.close(); | ||
| } | ||
|
|
||
| } |
Binary file added
BIN
+61.1 KB
...spring-boot-samples/doma-spring-boot-sample-testcontainers/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
17 changes: 17 additions & 0 deletions
17
...boot-samples/doma-spring-boot-sample-testcontainers/.mvn/wrapper/maven-wrapper.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip |
34 changes: 34 additions & 0 deletions
34
doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Doma Spring Boot Sample with TestContainers | ||
|
|
||
| This sample demonstrates how to use [TestContainers](https://www.testcontainers.org/) with Doma and Spring Boot. | ||
|
|
||
| ## Running the Sample | ||
|
|
||
| To run this sample, you need: | ||
| - Java 17 or later | ||
| - Maven | ||
| - Docker (for running TestContainers) | ||
|
|
||
| ### Build and Run Tests | ||
|
|
||
| This project uses the Maven Wrapper, so you don't need to install Maven separately. | ||
|
|
||
| ```bash | ||
| ./mvnw clean test | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add maven wrapper |
||
| ``` | ||
|
|
||
| ### Run with TestContainers | ||
|
|
||
| ```bash | ||
| ./mvnw spring-boot:test-run | ||
| ``` | ||
|
|
||
| This will start the application with a PostgreSQL container. | ||
|
|
||
| ## Features Demonstrated | ||
|
|
||
| - Using TestContainers to start a PostgreSQL database for tests | ||
| - Spring Boot's native TestContainers integration with `@ServiceConnection` | ||
| - Using TestContainers at development time with `SpringApplication.from()` | ||
| - Running Doma queries against a real PostgreSQL database in tests | ||
| - Configuration for both development (H2) and test (PostgreSQL) environments | ||
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, no. Include
.mvn,mvnwandmvnw.cmdin this repo