Attachment #172236 for bug #300458

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 276-281 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/localization/i18n/LoggingLocalizationResource.java (+2 lines)
276	{ "metadata_warning_ignore_fetch_group", "Ignoring the fetch groups specified on class [{0}] for the entity [{1}] since weaving is not enabled and the entity class does not implement the FetchGroupTracker interface." },	276	{ "metadata_warning_ignore_fetch_group", "Ignoring the fetch groups specified on class [{0}] for the entity [{1}] since weaving is not enabled and the entity class does not implement the FetchGroupTracker interface." },
277	{ "metadata_warning_ignore_mapping_metadata", "Ignoring the javax.persistence metadata applied to the attribute [{0}] from class [{1}]. javax.persistence metadata is ignored on fields or properties that are transient, static or abstract." },	277	{ "metadata_warning_ignore_mapping_metadata", "Ignoring the javax.persistence metadata applied to the attribute [{0}] from class [{1}]. javax.persistence metadata is ignored on fields or properties that are transient, static or abstract." },
278		278
		279	{ "metadata_warning_multiple_id_fields_without_id_class", "You have specified multiple ids for the entity class [{0}] without specifying an @IdClass. By doing this you may lose the ability to find by identity, distributed cache support etc. Note: You may however use entity manager find operations by passing a list of primary key fields. Else, you will have to use JPQL queries to read your entities. For other id options see @PrimaryKey." },
		280
279	{ "annotation_warning_ignore_annotation", "Ignoring the annotation [{0}] on the element [{1}] because of an XML metadata-complete setting of true for this class." },	281	{ "annotation_warning_ignore_annotation", "Ignoring the annotation [{0}] on the element [{1}] because of an XML metadata-complete setting of true for this class." },
280	{ "annotation_warning_ignore_private_owned", "Ignoring @PrivateOwned on element [{1}] within entity class [{0}]. A @PrivateOwned can only be used with a @OneToOne, @OneToMany and @VariableOneToOne. Also note, private ownership is implied with a @BasicCollection and @BasicMap." },	282	{ "annotation_warning_ignore_private_owned", "Ignoring @PrivateOwned on element [{1}] within entity class [{0}]. A @PrivateOwned can only be used with a @OneToOne, @OneToMany and @VariableOneToOne. Also note, private ownership is implied with a @BasicCollection and @BasicMap." },
281	{ "annotation_warning_ignore_return_insert", "Ignoring the @ReturnInsert on the element [{0}]. A @ReturnInsert is only supported with a basic mapping." },	283	{ "annotation_warning_ignore_return_insert", "Ignoring the @ReturnInsert on the element [{0}]. A @ReturnInsert is only supported with a basic mapping." },




/*******************************************************************************
 * Copyright (c) 2010 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     06/18/2010-2.2 Guy Pelletier 
 *       - 300458: EclispeLink should throw a more specific exception than NPE
 ******************************************************************************/ 
package org.eclipse.persistence.testing.models.jpa.inherited;

import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;

@MappedSuperclass
public class Bylaw {
    public String city;
    public int number;
    
    @Id
    public String getCity() {
        return city;
    }
    
    @Id
    @Column(name="NUMB")
    @GeneratedValue
    public int getNumber() {
        return number;
    }
    
    public void setCity(String city) {
        this.city = city;
    }
    
    public void setNumber(int number) {
        this.number = number;
    }
    
}

Lines 31-36 Link Here

(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/inherited/InheritedTableManager.java (-1 / +40 lines)
31	* - 299893: @MapKeyClass does not work with ElementCollection	31	* - 299893: @MapKeyClass does not work with ElementCollection
32	* 02/18/2010-2.0.2 Guy Pelletier	32	* 02/18/2010-2.0.2 Guy Pelletier
33	* - 294803: @Column(updatable=false) has no effect on @Basic mappings	33	* - 294803: @Column(updatable=false) has no effect on @Basic mappings
		34	* 06/18/2010-2.2 Guy Pelletier
		35	* - 300458: EclispeLink should throw a more specific exception than NPE
34	******************************************************************************/	36	******************************************************************************/
35	package org.eclipse.persistence.testing.models.jpa.inherited;	37	package org.eclipse.persistence.testing.models.jpa.inherited;
36		38
Lines 88-97 Link Here
88	addTableDefinition(build_COMMITTEE_Table());	90	addTableDefinition(build_COMMITTEE_Table());
89	addTableDefinition(build_SERIALNUMBER_Table());	91	addTableDefinition(build_SERIALNUMBER_Table());
90	addTableDefinition(build_TELEPHONE_NUMBER_Table());	92	addTableDefinition(build_TELEPHONE_NUMBER_Table());
91
92	addTableDefinition(build_LOCATION_Table());	93	addTableDefinition(build_LOCATION_Table());
93		94
94	addTableDefinition(build_BC_LOOKUP_Table());	95	addTableDefinition(build_BC_LOOKUP_Table());
		96	addTableDefinition(build_NOISE_BYLAW_Table());
95	}	97	}
96		98
97	public static TableDefinition build_ALPINE_Table() {	99	public static TableDefinition build_ALPINE_Table() {
Lines 837-842 Link Here
837	return table;	839	return table;
838	}	840	}
839		841
		842	public static TableDefinition build_NOISE_BYLAW_Table() {
		843	TableDefinition table = new TableDefinition();
		844	table.setName("JPA_NOISY");
		845
		846	FieldDefinition CITY_field = new FieldDefinition();
		847	CITY_field.setName("CITY");
		848	CITY_field.setTypeName("VARCHAR");
		849	CITY_field.setSize(25);
		850	CITY_field.setIsPrimaryKey(true);
		851	CITY_field.setUnique(false);
		852	CITY_field.setIsIdentity(false);
		853	CITY_field.setShouldAllowNull(false);
		854	table.addField(CITY_field);
		855
		856	FieldDefinition NUMB_field = new FieldDefinition();
		857	NUMB_field.setName("NUMB");
		858	NUMB_field.setTypeName("NUMERIC");
		859	NUMB_field.setSize(15);
		860	NUMB_field.setIsPrimaryKey(true);
		861	NUMB_field.setUnique(false);
		862	NUMB_field.setIsIdentity(false);
		863	NUMB_field.setShouldAllowNull(false);
		864	table.addField(NUMB_field);
		865
		866	FieldDefinition DESCRIP_field = new FieldDefinition();
		867	DESCRIP_field.setName("DESCRIP");
		868	DESCRIP_field.setTypeName("VARCHAR");
		869	DESCRIP_field.setSize(100);
		870	DESCRIP_field.setIsPrimaryKey(false);
		871	DESCRIP_field.setUnique(false);
		872	DESCRIP_field.setIsIdentity(false);
		873	DESCRIP_field.setShouldAllowNull(true);
		874	table.addField(DESCRIP_field);
		875
		876	return table;
		877	}
		878
840	public static TableDefinition build_EXPERT_BEER_CONSUMER_ACCLAIMS_Table() {	879	public static TableDefinition build_EXPERT_BEER_CONSUMER_ACCLAIMS_Table() {
841	TableDefinition table = new TableDefinition();	880	TableDefinition table = new TableDefinition();
842	table.setName("EXPERT_CONSUMER_ACCLAIMS");	881	table.setName("EXPERT_CONSUMER_ACCLAIMS");




/*******************************************************************************
 * Copyright (c) 2010 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     06/18/2010-2.2 Guy Pelletier 
 *       - 300458: EclispeLink should throw a more specific exception than NPE
 ******************************************************************************/ 
package org.eclipse.persistence.testing.models.jpa.inherited;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

@Entity
@Table(name="JPA_NOISY")
public class NoiseBylaw extends Bylaw {
    public String description;

    @Column(name="DESCRIP")
    public String getDescription() {
        return description;
    }

    public void setDescription(String description) {
        this.description = description;
    }
}

Lines 27-32 Link Here

(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/inherited/InheritedModelJunitTest.java (+42 lines)
27	* - 249037: JPA 2.0 persisting list item index	27	* - 249037: JPA 2.0 persisting list item index
28	* 02/18/2010-2.0.2 Guy Pelletier	28	* 02/18/2010-2.0.2 Guy Pelletier
29	* - 294803: @Column(updatable=false) has no effect on @Basic mappings	29	* - 294803: @Column(updatable=false) has no effect on @Basic mappings
		30	* 06/18/2010-2.2 Guy Pelletier
		31	* - 300458: EclispeLink should throw a more specific exception than NPE
30	******************************************************************************/	32	******************************************************************************/
31	package org.eclipse.persistence.testing.tests.jpa.inherited;	33	package org.eclipse.persistence.testing.tests.jpa.inherited;
32		34
Lines 62-67 Link Here
62	import org.eclipse.persistence.testing.models.jpa.inherited.Heineken;	64	import org.eclipse.persistence.testing.models.jpa.inherited.Heineken;
63	import org.eclipse.persistence.testing.models.jpa.inherited.InheritedTableManager;	65	import org.eclipse.persistence.testing.models.jpa.inherited.InheritedTableManager;
64	import org.eclipse.persistence.testing.models.jpa.inherited.Location;	66	import org.eclipse.persistence.testing.models.jpa.inherited.Location;
		67	import org.eclipse.persistence.testing.models.jpa.inherited.NoiseBylaw;
65	import org.eclipse.persistence.testing.models.jpa.inherited.NoviceBeerConsumer;	68	import org.eclipse.persistence.testing.models.jpa.inherited.NoviceBeerConsumer;
66	import org.eclipse.persistence.testing.models.jpa.inherited.Official;	69	import org.eclipse.persistence.testing.models.jpa.inherited.Official;
67	import org.eclipse.persistence.testing.models.jpa.inherited.OfficialEntry;	70	import org.eclipse.persistence.testing.models.jpa.inherited.OfficialEntry;
Lines 137-142 Link Here
137	suite.addTest(new InheritedModelJunitTest("testColumnUpdatableAndInsertable"));	140	suite.addTest(new InheritedModelJunitTest("testColumnUpdatableAndInsertable"));
138	suite.addTest(new InheritedModelJunitTest("testColumnUpdatableAndInsertableThroughQuery"));	141	suite.addTest(new InheritedModelJunitTest("testColumnUpdatableAndInsertableThroughQuery"));
139	suite.addTest(new InheritedModelJunitTest("testElementCollectionMapEmbeddable"));	142	suite.addTest(new InheritedModelJunitTest("testElementCollectionMapEmbeddable"));
		143	suite.addTest(new InheritedModelJunitTest("testMultipleIdButNonIdClassEntity"));
140		144
141	return suite;	145	return suite;
142	}	146	}
Lines 149-154 Link Here
149	clearCache();	153	clearCache();
150	}	154	}
151		155
		156	public void testMultipleIdButNonIdClassEntity() {
		157	EntityManager em = createEntityManager();
		158	beginTransaction(em);
		159
		160	NoiseBylaw noiseBylaw = new NoiseBylaw();
		161	int noiseBylawId = 0;
		162
		163	try {
		164	getServerSession().setLogLevel(0);
		165
		166	noiseBylaw.setCity("Ottawa");
		167	noiseBylaw.setDescription("Can't mow your grass after 9PM!");
		168	em.persist(noiseBylaw);
		169	noiseBylawId = noiseBylaw.getNumber();
		170	commitTransaction(em);
		171	} catch (RuntimeException e) {
		172	if (isTransactionActive(em)){
		173	rollbackTransaction(em);
		174	}
		175
		176	closeEntityManager(em);
		177	fail("An exception was caught during create operation: [" + e.getMessage() + "]");
		178	}
		179
		180	closeEntityManager(em);
		181
		182	clearCache();
		183	em = createEntityManager();
		184
		185	// find by object entity will not work since there is no IdClass in
		186	// this case so we will look it up through jpql
		187	String jpqlString = "SELECT n FROM NoiseBylaw n WHERE n.number =" + noiseBylawId;
		188	NoiseBylaw refreshedNoiseBylaw = (NoiseBylaw) em.createQuery(jpqlString).getSingleResult();
		189	assertTrue("The noise bylaw read back did not match the original", getServerSession().compareObjects(noiseBylaw, refreshedNoiseBylaw));
		190
		191	closeEntityManager(em);
		192	}
		193
152	public void testBecksBeerConsumer() {	194	public void testBecksBeerConsumer() {
153	EntityManager em = createEntityManager();	195	EntityManager em = createEntityManager();
154	beginTransaction(em);	196	beginTransaction(em);

Lines 63-68 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/accessors/classes/EntityAccessor.java (+9 lines)
63	* - 313401: shared-cache-mode defaults to NONE when the element value is unrecognized	63	* - 313401: shared-cache-mode defaults to NONE when the element value is unrecognized
64	* 06/14/2010-2.2 Guy Pelletier	64	* 06/14/2010-2.2 Guy Pelletier
65	* - 264417: Table generation is incorrect for JoinTables in AssociationOverrides	65	* - 264417: Table generation is incorrect for JoinTables in AssociationOverrides
		66	* 06/18/2010-2.2 Guy Pelletier
		67	* - 300458: EclispeLink should throw a more specific exception than NPE
66	******************************************************************************/	68	******************************************************************************/
67	package org.eclipse.persistence.internal.jpa.metadata.accessors.classes;	69	package org.eclipse.persistence.internal.jpa.metadata.accessors.classes;
68		70
Lines 1366-1371 Link Here
1366	if (getDescriptor().pkClassWasNotValidated()) {	1368	if (getDescriptor().pkClassWasNotValidated()) {
1367	throw ValidationException.invalidCompositePKSpecification(getJavaClass(), getDescriptor().getPKClassName());	1369	throw ValidationException.invalidCompositePKSpecification(getJavaClass(), getDescriptor().getPKClassName());
1368	}	1370	}
		1371
		1372	// Log a warning to the user that they have specified multiple id
		1373	// fields without an id class specification. If they are using a
		1374	// @PrimaryKey specification don't issue the warning.
		1375	if (! getDescriptor().hasPKClass() && ! getDescriptor().hasPrimaryKey()) {
		1376	getLogger().logWarningMessage(MetadataLogger.MULTIPLE_ID_FIELDS_WITHOUT_ID_CLASS, getJavaClassName());
		1377	}
1369	} else {	1378	} else {
1370	// Descriptor has a single primary key. Validate an id	1379	// Descriptor has a single primary key. Validate an id
1371	// attribute was found, unless we are an inheritance subclass	1380	// attribute was found, unless we are an inheritance subclass

Lines 66-71 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataDescriptor.java (+22 lines)
66	* - 315195: Add new property to avoid reading XML during the canonical model generation	66	* - 315195: Add new property to avoid reading XML during the canonical model generation
67	* 06/14/2010-2.2 Guy Pelletier	67	* 06/14/2010-2.2 Guy Pelletier
68	* - 264417: Table generation is incorrect for JoinTables in AssociationOverrides	68	* - 264417: Table generation is incorrect for JoinTables in AssociationOverrides
		69	* 06/18/2010-2.2 Guy Pelletier
		70	* - 300458: EclispeLink should throw a more specific exception than NPE
69	******************************************************************************/	71	******************************************************************************/
70	package org.eclipse.persistence.internal.jpa.metadata;	72	package org.eclipse.persistence.internal.jpa.metadata;
71		73
Lines 131-136 Link Here
131	private boolean m_hasCustomizer;	133	private boolean m_hasCustomizer;
132	private boolean m_hasReadOnly;	134	private boolean m_hasReadOnly;
133	private boolean m_hasCopyPolicy;	135	private boolean m_hasCopyPolicy;
		136	private boolean m_hasPrimaryKey;
134		137
135	// Default access methods are used for VIRTUAL mapping attributes when	138	// Default access methods are used for VIRTUAL mapping attributes when
136	// the attributes do not specify their own access methods.	139	// the attributes do not specify their own access methods.
Lines 199-204 Link Here
199	m_hasCustomizer = false;	202	m_hasCustomizer = false;
200	m_hasReadOnly = false;	203	m_hasReadOnly = false;
201	m_hasCopyPolicy = false;	204	m_hasCopyPolicy = false;
		205	m_hasPrimaryKey = false;
202	m_isCascadePersist = false;	206	m_isCascadePersist = false;
203	m_ignoreAnnotations = false;	207	m_ignoreAnnotations = false;
204	m_ignoreDefaultMappings = false;	208	m_ignoreDefaultMappings = false;
Lines 1079-1084 Link Here
1079	public boolean hasCopyPolicy() {	1083	public boolean hasCopyPolicy() {
1080	return m_hasCopyPolicy;	1084	return m_hasCopyPolicy;
1081	}	1085	}
		1086
		1087	/**
		1088	* INTERNAL:
		1089	* Indicates that a PrimaryKey annotation or primary-key element has been
		1090	* processed for this descriptor.
		1091	*/
		1092	public boolean hasPrimaryKey() {
		1093	return m_hasPrimaryKey;
		1094	}
1082		1095
1083	/**	1096	/**
1084	* INTERNAL:	1097	* INTERNAL:
Lines 1471-1476 Link Here
1471		1484
1472	/**	1485	/**
1473	* INTERNAL:	1486	* INTERNAL:
		1487	* Indicates that we have processed a PrimaryKey annotation or primary-key
		1488	* xml element.
		1489	*/
		1490	public void setHasPrimaryKey() {
		1491	m_hasPrimaryKey = true;
		1492	}
		1493
		1494	/**
		1495	* INTERNAL:
1474	* Indicates that we have processed a change tracking annotation or change	1496	* Indicates that we have processed a change tracking annotation or change
1475	* tracking xml element.	1497	* tracking xml element.
1476	*/	1498	*/

Lines 11-16 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/PrimaryKeyMetadata.java (+4 lines)
11	* James Sutherland - initial impl	11	* James Sutherland - initial impl
12	* 04/27/2010-2.1 Guy Pelletier	12	* 04/27/2010-2.1 Guy Pelletier
13	* - 309856: MappedSuperclasses from XML are not being initialized properly	13	* - 309856: MappedSuperclasses from XML are not being initialized properly
		14	* 06/18/2010-2.2 Guy Pelletier
		15	* - 300458: EclispeLink should throw a more specific exception than NPE
14	******************************************************************************/	16	******************************************************************************/
15	package org.eclipse.persistence.internal.jpa.metadata;	17	package org.eclipse.persistence.internal.jpa.metadata;
16		18
Lines 118-123 Link Here
118	* Process the meta-data, configure primary key and idValidation in descriptor.	120	* Process the meta-data, configure primary key and idValidation in descriptor.
119	*/	121	*/
120	public void process(MetadataDescriptor descriptor) {	122	public void process(MetadataDescriptor descriptor) {
		123	descriptor.setHasPrimaryKey();
		124
121	if (m_validation != null) {	125	if (m_validation != null) {
122	descriptor.getClassDescriptor().setIdValidation(IdValidation.valueOf(m_validation));	126	descriptor.getClassDescriptor().setIdValidation(IdValidation.valueOf(m_validation));
123	}	127	}

Return to bug 300458

Line 0 Link Here

(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/inherited/Bylaw.java (+46 lines)
	1	/*******************************************************************************
	2	* Copyright (c) 2010 Oracle. All rights reserved.
	3	* This program and the accompanying materials are made available under the
	4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
	5	* which accompanies this distribution.
	6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
	7	* and the Eclipse Distribution License is available at
	8	* http://www.eclipse.org/org/documents/edl-v10.php.
	9	*
	10	* Contributors:
	11	* 06/18/2010-2.2 Guy Pelletier
	12	* - 300458: EclispeLink should throw a more specific exception than NPE
	13	******************************************************************************/
	14	package org.eclipse.persistence.testing.models.jpa.inherited;
	15
	16	import javax.persistence.Column;
	17	import javax.persistence.GeneratedValue;
	18	import javax.persistence.Id;
	19	import javax.persistence.MappedSuperclass;
	20
	21	@MappedSuperclass
	22	public class Bylaw {
	23	public String city;
	24	public int number;
	25
	26	@Id
	27	public String getCity() {
	28	return city;
	29	}
	30
	31	@Id
	32	@Column(name="NUMB")
	33	@GeneratedValue
	34	public int getNumber() {
	35	return number;
	36	}
	37
	38	public void setCity(String city) {
	39	this.city = city;
	40	}
	41
	42	public void setNumber(int number) {
	43	this.number = number;
	44	}
	45
	46	}

Lines 27-32 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java (+6 lines)
27	* - 277039: JPA 2.0 Cache Usage Settings	27	* - 277039: JPA 2.0 Cache Usage Settings
28	* 01/19/2010-2.1 Guy Pelletier	28	* 01/19/2010-2.1 Guy Pelletier
29	* - 211322: Add fetch-group(s) support to the EclipseLink-ORM.XML Schema	29	* - 211322: Add fetch-group(s) support to the EclipseLink-ORM.XML Schema
		30	* 06/18/2010-2.2 Guy Pelletier
		31	* - 300458: EclispeLink should throw a more specific exception than NPE
30	******************************************************************************/	32	******************************************************************************/
31	package org.eclipse.persistence.internal.jpa.metadata;	33	package org.eclipse.persistence.internal.jpa.metadata;
32		34
Lines 105-111 Link Here
105	public static final String IGNORE_FETCH_GROUP = "metadata_warning_ignore_fetch_group";	107	public static final String IGNORE_FETCH_GROUP = "metadata_warning_ignore_fetch_group";
106	public static final String IGNORE_MAPPING_METADATA = "metadata_warning_ignore_mapping_metadata";	108	public static final String IGNORE_MAPPING_METADATA = "metadata_warning_ignore_mapping_metadata";
107		109
		110	public static final String MULTIPLE_ID_FIELDS_WITHOUT_ID_CLASS = "metadata_warning_multiple_id_fields_without_id_class";
108		111
		112
109	/*************************************************************************/	113	/*************************************************************************/
110	/* GENERIC DEFAULT MESSSAGES */	114	/* GENERIC DEFAULT MESSSAGES */
111	/*************************************************************************/	115	/*************************************************************************/
Lines 239-244 Link Here
239	addContextString(IGNORE_FETCH_GROUP);	243	addContextString(IGNORE_FETCH_GROUP);
240	addContextString(IGNORE_MAPPING_METADATA);	244	addContextString(IGNORE_MAPPING_METADATA);
241		245
		246	addContextString(MULTIPLE_ID_FIELDS_WITHOUT_ID_CLASS);
		247
242	// Generic default messages that could apply to XML and annotation	248	// Generic default messages that could apply to XML and annotation
243	// configurations.	249	// configurations.
244	addContextString(ACCESS_TYPE);	250	addContextString(ACCESS_TYPE);