Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix Ambiguous dependencies for type PersistenceUnitInfo #4568

Merged
merged 2 commits into from
Jul 18, 2022
Merged

Fix Ambiguous dependencies for type PersistenceUnitInfo #4568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b13a87
Fix Ambiguous dependencies for type PersistenceUnitInfo
aserkes Jul 18, 2022
24c3b83
Merge branch 'master' into 4548_db_mp_h2_tests
aserkes Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...etype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ metrics.rest-request.enabled=false
{{.}}
{{/config-entries}}

{{#database}}
{{#database-hikari}}
# Datasource properties
javax.sql.DataSource.{{ds-name}}.dataSourceClassName={{jdbcDataSource}}
javax.sql.DataSource.{{ds-name}}.dataSource.url=database_url
javax.sql.DataSource.{{ds-name}}.dataSource.url={{databaseUrl}}
javax.sql.DataSource.{{ds-name}}.dataSource.user=db_user
javax.sql.DataSource.{{ds-name}}.dataSource.password=user_password
{{/database}}
{{/database-hikari}}
{{#database-ucp}}
oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.url={{databaseUrl}}
oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.connectionFactoryClassName={{jdbcDataSource}}
oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user=db_user
oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password=user_password
{{/database-ucp}}
5 changes: 4 additions & 1 deletion ...s/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ import {{.}};
import {{.}};
{{/MainTest-static-imports}}

{{#helidon-test}}
@HelidonTest
@TestMethodOrder(MethodOrderer.MethodName.class)
{{/helidon-test}}
public class MainTest {

{{#helidon-test}}
{{#MainTest-static-fields}}
{{.}}
{{/MainTest-static-fields}}
Expand All @@ -31,4 +33,5 @@ public class MainTest {
{{#MainTest-methods}}
{{.}}
{{/MainTest-methods}}
{{/helidon-test}}
}
1 change: 1 addition & 0 deletions archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
</includes>
</files>
<model>
<value key="helidon-test">true</value>
<value key="readme-description">Minimal Helidon MP project suitable to start from scratch.</value>
<list key="readme-exercise-the-application">
<value file="files/README.md"/>
Expand Down
140 changes: 77 additions & 63 deletions archetypes/helidon/src/main/archetype/mp/custom/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
<option value="hikaricp" name="HikariCP" description="&quot;zero overhead&quot; JDBC connection pool">
<output>
<model>
<value key="database-hikari">true</value>
<list key="dependencies">
<map>
<value key="groupId">io.helidon.integrations.cdi</value>
Expand All @@ -156,6 +157,7 @@
<option value="ucp" name="UCP" description="Universal Connection Pool">
<output>
<model>
<value key="database-ucp">true</value>
<list key="dependencies">
<map>
<value key="groupId">io.helidon.integrations.cdi</value>
Expand Down Expand Up @@ -193,12 +195,85 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
</map>
</list>
<value key="jdbcDataSource">org.h2.jdbcx.JdbcDataSource</value>
<value key="databaseUrl">jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</value>
<list key="MainTest-methods">
<value><![CDATA[
@Test
void testPokemonTypes() {
JsonArray types = target
.path("type")
.request()
.get(JsonArray.class);
assertThat(types.size(), is(18));
}

@Test
void testPokemon() {
assertThat(getPokemonCount(), is(6));

Pokemon pokemon = target
.path("pokemon/1")
.request()
.get(Pokemon.class);
assertThat(pokemon.getName(), is("Bulbasaur"));

pokemon = target
.path("pokemon/name/Charmander")
.request()
.get(Pokemon.class);
assertThat(pokemon.getType(), is(10));

Response response = target
.path("pokemon/1")
.request()
.get();
assertThat(response.getStatus(), is(200));

Pokemon test = new Pokemon();
test.setType(1);
test.setId(100);
test.setName("Test");
response = target
.path("pokemon")
.request()
.post(Entity.entity(test, MediaType.APPLICATION_JSON));
assertThat(response.getStatus(), is(204));
assertThat(getPokemonCount(), is(7));

response = target
.path("pokemon/100")
.request()
.delete();
assertThat(response.getStatus(), is(204));
assertThat(getPokemonCount(), is(6));
}

private int getPokemonCount() {
JsonArray pokemons = target
.path("pokemon")
.request()
.get(JsonArray.class);
return pokemons.size();
}
]]></value>
</list>
<list key="main-persistence-properties">
<map>
<value key="name">jakarta.persistence.sql-load-script-source</value>
<value key="value">META-INF/init_script.sql</value>
</map>
<map>
<value key="name">jakarta.persistence.schema-generation.database.action</value>
<value key="value">drop-and-create</value>
</map>
</list>
</model>
</output>
</option>
<option value="mysql" name="MySQL" description="Relational database">
<output>
<model>
<value key="helidon-test">false</value>
<value key="readme-description">Helidon MP application that uses the dbclient API with MySQL database.</value>
<value key="readme-native-docker">docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password mysql:5.7</value>
<value key="readme-native-url">url: jdbc:mysql:tcp://127.0.0.1:3306/pokemon?useSSL=false</value>
Expand Down Expand Up @@ -237,6 +312,7 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
<option value="oracledb" name="Oracle DB" description="Multi-model database">
<output>
<model>
<value key="helidon-test">false</value>
<value key="readme-description">Helidon MP application that uses the dbclient API with OracleDB database.</value>
<value key="readme-native-docker">docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnameless/oracle-xe-11g-r2</value>
<value key="readme-native-url">url: jdbc:oracle:thin:@localhost:1521/XE</value>
Expand Down Expand Up @@ -282,7 +358,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
<value key="name">hibernate.hbm2ddl.auto</value>
<value key="value">create-drop</value>
</map>
<map if="${..jpa-impl} == 'eclipselink'">
<map if="${..jpa-impl} == 'eclipselink' &amp;&amp; ${..server} != 'h2'">
<value key="name">eclipselink.ddl-generation</value>
<value key="value">drop-and-create-tables</value>
</map>
Expand All @@ -298,7 +374,6 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
<directory>../database/files</directory>
<includes>
<include>src/*/resources/*/init_script.sql</include>
<include>src/test/resources/*/microprofile-config.properties</include>
</includes>
</files>
<templates engine="mustache" transformations="mustache,packaged">
Expand Down Expand Up @@ -408,67 +483,6 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
</executions>
</plugin>]]></value>
</list>
<list key="MainTest-methods">
<value><![CDATA[
@Test
void testPokemonTypes() {
JsonArray types = target
.path("type")
.request()
.get(JsonArray.class);
assertThat(types.size(), is(18));
}

@Test
void testPokemon() {
assertThat(getPokemonCount(), is(6));

Pokemon pokemon = target
.path("pokemon/1")
.request()
.get(Pokemon.class);
assertThat(pokemon.getName(), is("Bulbasaur"));

pokemon = target
.path("pokemon/name/Charmander")
.request()
.get(Pokemon.class);
assertThat(pokemon.getType(), is(10));

Response response = target
.path("pokemon/1")
.request()
.get();
assertThat(response.getStatus(), is(200));

Pokemon test = new Pokemon();
test.setType(1);
test.setId(100);
test.setName("Test");
response = target
.path("pokemon")
.request()
.post(Entity.entity(test, MediaType.APPLICATION_JSON));
assertThat(response.getStatus(), is(204));
assertThat(getPokemonCount(), is(7));

response = target
.path("pokemon/100")
.request()
.delete();
assertThat(response.getStatus(), is(204));
assertThat(getPokemonCount(), is(6));
}

private int getPokemonCount() {
JsonArray pokemons = target
.path("pokemon")
.request()
.get(JsonArray.class);
return pokemons.size();
}
]]></value>
</list>
</model>
</output>
</boolean>
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonResource.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import java.util.List;
@Path("pokemon")
public class PokemonResource {

@PersistenceContext(unitName = "test")
@PersistenceContext(unitName = "{{pu-name}}")
private EntityManager entityManager;

@GET
Expand Down
2 changes: 1 addition & 1 deletion .../main/archetype/mp/database/files/src/main/java/__pkg__/PokemonTypeResource.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import jakarta.ws.rs.core.MediaType;
@Path("type")
public class PokemonTypeResource {

@PersistenceContext(unitName = "test")
@PersistenceContext(unitName = "{{pu-name}}")
private EntityManager entityManager;

@GET
Expand Down