HHH-14276 Amend style and formatting

This commit is contained in:
Sanne Grinovero 2020-11-16 12:07:42 +00:00
parent d1ee641e54
commit f9cce5a767
5 changed files with 296 additions and 313 deletions

View File

@ -1,3 +1,9 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.mapping.hhh14276;
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@ -7,47 +13,42 @@ import java.util.Map;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.hql.spi.id.inline.InlineIdsOrClauseBulkIdStrategy;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.test.mapping.hhh14276.entity.PlayerStat;
import org.hibernate.test.mapping.hhh14276.entity.Score;
import org.hibernate.testing.TestForIssue;
import org.junit.Before;
import org.junit.Test;
/**
* This template demonstrates how to develop a test case for Hibernate ORM, using the Java Persistence API.
*/
@TestForIssue( jiraKey = "HHH-14276" )
public class NestedIdClassDerivedIdentifiersTest extends BaseEntityManagerFunctionalTestCase
{
@Override
protected Class<?>[] getAnnotatedClasses()
{
return new Class<?>[] { PlayerStat.class,
Score.class };
}
@TestForIssue(jiraKey = "HHH-14276")
public class NestedIdClassDerivedIdentifiersTest extends BaseEntityManagerFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] {
PlayerStat.class,
Score.class
};
}
@Override
protected void addConfigOptions( Map options )
{
options.put( AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, Boolean.TRUE );
options.put( AvailableSettings.HQL_BULK_ID_STRATEGY, InlineIdsOrClauseBulkIdStrategy.class.getName() );
}
@Override
protected void addConfigOptions(Map options) {
options.put( AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, Boolean.TRUE );
options.put( AvailableSettings.HQL_BULK_ID_STRATEGY, InlineIdsOrClauseBulkIdStrategy.class.getName() );
}
@Before
public void setUp()
{
doInJPA( this::entityManagerFactory, em ->
{
// do nothing
} );
}
@Before
public void setUp() {
doInJPA( this::entityManagerFactory, em ->
{
// do nothing
} );
}
@Test
public void testNestedIdClassDerivedIdentifiers() throws Exception
{
doInJPA( this::entityManagerFactory, em ->
{
// do nothing
});
}
@Test
public void testNestedIdClassDerivedIdentifiers() {
doInJPA( this::entityManagerFactory, em ->
{
// do nothing
} );
}
}

View File

@ -1,3 +1,9 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.mapping.hhh14276.entity;
import java.io.Serializable;
@ -15,75 +21,62 @@ import javax.persistence.Table;
@Entity
@Table(name = "\"PlayerStats\"")
@IdClass(PlayerStatId.class)
public class PlayerStat implements Serializable
{
private static final long serialVersionUID = 1L;
public class PlayerStat implements Serializable {
@Id
@Column(name = "player_id")
private Integer playerId;
@Id
@Column(name = "player_id")
private Integer playerId;
@Basic(optional = false)
@Column(name = "jersey_nbr")
private Integer jerseyNbr;
@Basic(optional = false)
@Column(name = "jersey_nbr")
private Integer jerseyNbr;
@Id
@ManyToOne(optional = false, fetch = FetchType.EAGER)
@JoinColumn(name = "game_id", referencedColumnName = "game_id")
@JoinColumn(name = "is_home", referencedColumnName = "is_home")
private Score score;
@Id
@ManyToOne(optional = false, fetch = FetchType.EAGER)
@JoinColumn(name = "game_id", referencedColumnName = "game_id")
@JoinColumn(name = "is_home", referencedColumnName = "is_home")
private Score score;
public PlayerStat()
{
}
public PlayerStat() {
}
public Integer getGameId()
{
return score.getGameId();
}
public Integer getGameId() {
return score.getGameId();
}
public void setGameId(Integer gameId)
{
score.setGameId(gameId);
}
public void setGameId(Integer gameId) {
score.setGameId( gameId );
}
public Boolean getHome()
{
return score.getHome();
}
public Boolean getHome() {
return score.getHome();
}
public void setHome(Boolean home)
{
score.setHome(home);
}
public void setHome(Boolean home) {
score.setHome( home );
}
public Integer getPlayerId()
{
return playerId;
}
public Integer getPlayerId() {
return playerId;
}
public void setPlayerId(Integer playerId)
{
this.playerId = playerId;
}
public void setPlayerId(Integer playerId) {
this.playerId = playerId;
}
public Integer getJerseyNbr()
{
return jerseyNbr;
}
public Integer getJerseyNbr() {
return jerseyNbr;
}
public void setJerseyNbr(Integer jerseyNbr)
{
this.jerseyNbr = jerseyNbr;
}
public void setJerseyNbr(Integer jerseyNbr) {
this.jerseyNbr = jerseyNbr;
}
public Score getScore()
{
return score;
}
public Score getScore() {
return score;
}
public void setScore(Score score)
{
this.score = score;
}
public void setScore(Score score) {
this.score = score;
}
}

View File

@ -1,57 +1,52 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.mapping.hhh14276.entity;
import java.io.Serializable;
public class PlayerStatId implements Serializable
{
private static final long serialVersionUID = 1L;
public class PlayerStatId implements Serializable {
private Integer playerId;
private Integer playerId;
// nested composite PK @IdClass: named like relationship in entity class
private ScoreId score;
// nested composite PK @IdClass: named like relationship in entity class
private ScoreId score;
public PlayerStatId()
{
}
public PlayerStatId() {
}
public Integer getGameId()
{
return score.getGameId();
}
public Integer getGameId() {
return score.getGameId();
}
public void setGameId(Integer gameId)
{
score.setGameId(gameId);
}
public void setGameId(Integer gameId) {
score.setGameId( gameId );
}
public Boolean getHome()
{
return score.getHome();
}
public Boolean getHome() {
return score.getHome();
}
public void setHome(Boolean home)
{
score.setHome(home);
}
public void setHome(Boolean home) {
score.setHome( home );
}
public Integer getPlayerId()
{
return playerId;
}
public Integer getPlayerId() {
return playerId;
}
public void setPlayerId(Integer playerId)
{
this.playerId = playerId;
}
public void setPlayerId(Integer playerId) {
this.playerId = playerId;
}
public ScoreId getScoreId()
{
return score;
}
public ScoreId getScoreId() {
return score;
}
public void setScoreId(ScoreId scoreId)
{
this.score = scoreId;
}
public void setScoreId(ScoreId scoreId) {
this.score = scoreId;
}
}

View File

@ -1,3 +1,9 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.mapping.hhh14276.entity;
import java.io.Serializable;
@ -12,67 +18,56 @@ import javax.persistence.Table;
@Entity
@Table(name = "\"Scores\"")
@IdClass(ScoreId.class)
public class Score implements Serializable
{
private static final long serialVersionUID = 1L;
public class Score implements Serializable {
@Id
@Column(name = "game_id")
private Integer gameId;
@Id
@Column(name = "game_id")
private Integer gameId;
@Id
@Column(name = "is_home")
private Boolean home;
@Id
@Column(name = "is_home")
private Boolean home;
@Basic(optional = false)
@Column(name = "roster_id")
private Integer rosterId;
@Basic(optional = false)
@Column(name = "roster_id")
private Integer rosterId;
@Basic
@Column(name = "final_score")
private Integer finalScore;
@Basic
@Column(name = "final_score")
private Integer finalScore;
public Score()
{
}
public Score() {
}
public Integer getGameId()
{
return gameId;
}
public Integer getGameId() {
return gameId;
}
public void setGameId(Integer gameId)
{
this.gameId = gameId;
}
public void setGameId(Integer gameId) {
this.gameId = gameId;
}
public Boolean getHome()
{
return home;
}
public Boolean getHome() {
return home;
}
public void setHome(Boolean home)
{
this.home = home;
}
public void setHome(Boolean home) {
this.home = home;
}
public Integer getRosterId()
{
return rosterId;
}
public Integer getRosterId() {
return rosterId;
}
public void setRosterId(Integer rosterId)
{
this.rosterId = rosterId;
}
public void setRosterId(Integer rosterId) {
this.rosterId = rosterId;
}
public Integer getFinalScore()
{
return finalScore;
}
public Integer getFinalScore() {
return finalScore;
}
public void setFinalScore(Integer finalScore)
{
this.finalScore = finalScore;
}
public void setFinalScore(Integer finalScore) {
this.finalScore = finalScore;
}
}

View File

@ -1,36 +1,35 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.mapping.hhh14276.entity;
import java.io.Serializable;
public class ScoreId implements Serializable
{
private static final long serialVersionUID = 1L;
public class ScoreId implements Serializable {
private Integer gameId;
private Integer gameId;
private Boolean home;
private Boolean home;
public ScoreId()
{
}
public ScoreId() {
}
public Integer getGameId()
{
return gameId;
}
public Integer getGameId() {
return gameId;
}
public void setGameId(Integer gameId)
{
this.gameId = gameId;
}
public void setGameId(Integer gameId) {
this.gameId = gameId;
}
public Boolean getHome()
{
return home;
}
public Boolean getHome() {
return home;
}
public void setHome(Boolean home)
{
this.home = home;
}
public void setHome(Boolean home) {
this.home = home;
}
}