Skip to content

Commit

Permalink
HSEARCH-2508 Restore the use of @IndexedEmbedded in tests to mark fie…
Browse files Browse the repository at this point in the history 
…lds where container bridges should be used

This use has been removed as part of
c051bfe, so we are partially reverting
this commit here.
  • Loading branch information
@yrodiere @Sanne
yrodiere authored and Sanne committed Dec 19, 2016
1 parent afc3aa8 commit d6e4340
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
6 changes: 6 additions & 0 deletions orm/src/test/java/org/hibernate/search/test/bridge/ArrayBridgeTestEntity.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.hibernate.search.annotations.DateBridge;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.annotations.Store;

Expand Down Expand Up @@ -72,6 +73,7 @@ public void setName(String name) {

@Field(indexNullAs = NULL_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@OrderColumn
@CollectionTable(name = "NullIndexed", joinColumns = @JoinColumn(name = "array_id"))
@Column(name = "nullIndexed")
Expand All @@ -85,6 +87,7 @@ public void setNullIndexed(Language[] nullIndexed) {

@Field(store = Store.YES, indexNullAs = NULL_NUMERIC_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@OrderColumn
@CollectionTable(name = "NumericNullIndexed", joinColumns = @JoinColumn(name = "array_id"))
@Column(name = "numericNullIndexed")
Expand All @@ -98,6 +101,7 @@ public void setNumericNullIndexed(Integer[] phoneNumbers) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@OrderColumn
@CollectionTable(name = "NullNotIndexed", joinColumns = @JoinColumn(name = "array_id"))
@Column(name = "nullNotIndexed")
Expand All @@ -111,6 +115,7 @@ public void setNullNotIndexed(String[] skipNullCollection) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@OrderColumn
@CollectionTable(name = "NumericNullNotIndexed", joinColumns = @JoinColumn(name = "array_id"))
@Column(name = "numericNullNotIndexed")
Expand All @@ -124,6 +129,7 @@ public void setNumericNullNotIndexed(Long[] numericSkipNullCollection) {

@Field(analyze = Analyze.NO, store = Store.YES)
@ElementCollection
@IndexedEmbedded
@DateBridge(resolution = Resolution.SECOND)
@OrderColumn
@CollectionTable(name = "Dates", joinColumns = @JoinColumn(name = "array_id"))
Expand Down
6 changes: 6 additions & 0 deletions orm/src/test/java/org/hibernate/search/test/bridge/IterableBridgeTestEntity.java
View file
Expand Up @@ -25,6 +25,7 @@
import org.hibernate.search.annotations.DateBridge;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.annotations.Store;

Expand Down Expand Up @@ -75,6 +76,7 @@ public void setName(String name) {

@Field(indexNullAs = NULL_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NullIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "nullIndexed")
public Set<Language> getNullIndexed() {
Expand All @@ -91,6 +93,7 @@ public void addNullIndexed(Language nullIndexed) {

@Field(store = Store.YES, indexNullAs = NULL_NUMERIC_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NumericNullIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "numericNullIndexed")
public Set<Integer> getNumericNullIndexed() {
Expand All @@ -107,6 +110,7 @@ public void addNumericNullIndexed(Integer number) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NullNotIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "nullNotIndexed")
public List<String> getNullNotIndexed() {
Expand All @@ -123,6 +127,7 @@ public void addNullNotIndexed(String value) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NumericNullNotIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "numericNullNotIndexed")
public List<Long> getNumericNullNotIndexed() {
Expand All @@ -139,6 +144,7 @@ public void addNumericNullNotIndexed(Long value) {

@Field(analyze = Analyze.NO, store = Store.YES)
@ElementCollection
@IndexedEmbedded
@DateBridge(resolution = Resolution.SECOND)
@CollectionTable(name = "Dates", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "dates")
Expand Down
6 changes: 6 additions & 0 deletions orm/src/test/java/org/hibernate/search/test/bridge/MapBridgeTestEntity.java
View file
Expand Up @@ -23,6 +23,7 @@
import org.hibernate.search.annotations.DateBridge;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.annotations.Store;

Expand Down Expand Up @@ -73,6 +74,7 @@ public void setName(String name) {

@Field(indexNullAs = NULL_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NullIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "nullIndexed")
@MapKeyColumn(nullable = false)
Expand All @@ -90,6 +92,7 @@ public void addNullIndexed(Integer key, Language nullIndexed) {

@Field(store = Store.YES, indexNullAs = NULL_NUMERIC_TOKEN, analyze = Analyze.NO)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NumericNullIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "numericNullIndexed")
@MapKeyColumn(nullable = false)
Expand All @@ -107,6 +110,7 @@ public void addNumericNullIndexed(Integer key, Integer number) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NullNotIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "nullNotIndexed")
@MapKeyColumn(nullable = false)
Expand All @@ -124,6 +128,7 @@ public void addNullNotIndexed(Integer key, String value) {

@Field(store = Store.YES)
@ElementCollection
@IndexedEmbedded
@CollectionTable(name = "NumericNullNotIndexed", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "numericNullNotIndexed")
@MapKeyColumn(nullable = false)
Expand All @@ -141,6 +146,7 @@ public void addNumericNullNotIndexed(Integer key, Long value) {

@Field(analyze = Analyze.NO, store = Store.YES)
@ElementCollection
@IndexedEmbedded
@DateBridge(resolution = Resolution.SECOND)
@CollectionTable(name = "Dates", joinColumns = @JoinColumn(name = "iterable_id"))
@Column(name = "dates")
Expand Down

0 comments on commit d6e4340

Please sign in to comment.