Author: epbernard
Date: 2008-07-28 13:09:56 -0400 (Mon, 28 Jul 2008)
New Revision: 14972

Modified:
 search/trunk/src/java/org/hibernate/search/store/IdHashShardingStrategy.java
 search/trunk/src/java/org/hibernate/search/store/IndexShardingStrategy.java
 search/trunk/src/java/org/hibernate/search/store/NotShardedStrategy.java
 search/trunk/src/test/org/hibernate/search/test/configuration/UselessShardingStrategy.java
Log:
HSEARCH-240 generify the index sharding strategy (backward compatible)

Modified: search/trunk/src/java/org/hibernate/search/store/IdHashShardingStrategy.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/IdHashShardingStrategy.java  2008-07-28 15:47:28 UTC (rev 14971)
+++ search/trunk/src/java/org/hibernate/search/store/IdHashShardingStrategy.java  2008-07-28 17:09:56 UTC (rev 14972)
@@(protected) @@
* @author Emmanuel Bernard
*/
public class IdHashShardingStrategy implements IndexShardingStrategy {
-  private DirectoryProvider[] providers;
-  public void initialize(Properties properties, DirectoryProvider[] providers) {
+  private DirectoryProvider<?>[] providers;
+  public void initialize(Properties properties, DirectoryProvider<?>[] providers) {
   this.providers = providers;
 }

-  public DirectoryProvider[] getDirectoryProvidersForAllShards() {
+  public DirectoryProvider<?>[] getDirectoryProvidersForAllShards() {
   return providers;
 }

-  public DirectoryProvider getDirectoryProviderForAddition(Class entity, Serializable id, String idInString, Document document) {
+  public DirectoryProvider<?> getDirectoryProviderForAddition(Class<?> entity, Serializable id, String idInString, Document document) {
   return providers[ hashKey(idInString) ];
 }

-  public DirectoryProvider[] getDirectoryProvidersForDeletion(Class entity, Serializable id, String idInString) {
+  public DirectoryProvider<?>[] getDirectoryProvidersForDeletion(Class<?> entity, Serializable id, String idInString) {
   if ( idInString == null ) return providers;
   return new DirectoryProvider[] { providers[ hashKey(idInString) ] };
 }

Modified: search/trunk/src/java/org/hibernate/search/store/IndexShardingStrategy.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/IndexShardingStrategy.java  2008-07-28 15:47:28 UTC (rev 14971)
+++ search/trunk/src/java/org/hibernate/search/store/IndexShardingStrategy.java  2008-07-28 17:09:56 UTC (rev 14972)
@@(protected) @@
  * provides access to sharding properties (under the suffix sharding_strategy)
  * and provide access to all the DirectoryProviders for a given index
  */
-  void initialize(Properties properties, DirectoryProvider[] providers);
+  void initialize(Properties properties, DirectoryProvider<?>[] providers);

 /**
  * Ask for all shards (eg to query or optimize)
  */
-  DirectoryProvider[] getDirectoryProvidersForAllShards();
+  DirectoryProvider<?>[] getDirectoryProvidersForAllShards();

 /**
  * return the DirectoryProvider where the given entity will be indexed
  */
-  DirectoryProvider getDirectoryProviderForAddition(Class entity, Serializable id, String idInString, Document document);
+  DirectoryProvider<?> getDirectoryProviderForAddition(Class<?> entity, Serializable id, String idInString, Document document);
 /**
  * return the DirectoryProvider(s) where the given entity is stored and where the deletion operation needs to be applied
  * id and idInString can be null. If null, all the directory providers containing entity types should be returned
  */
-  DirectoryProvider[] getDirectoryProvidersForDeletion(Class entity, Serializable id, String idInString);
+  DirectoryProvider<?>[] getDirectoryProvidersForDeletion(Class<?> entity, Serializable id, String idInString);
}

Modified: search/trunk/src/java/org/hibernate/search/store/NotShardedStrategy.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/NotShardedStrategy.java  2008-07-28 15:47:28 UTC (rev 14971)
+++ search/trunk/src/java/org/hibernate/search/store/NotShardedStrategy.java  2008-07-28 17:09:56 UTC (rev 14972)
@@(protected) @@
* @author Emmanuel Bernard
*/
public class NotShardedStrategy implements IndexShardingStrategy {
-  private DirectoryProvider[] directoryProvider;
-  public void initialize(Properties properties, DirectoryProvider[] providers) {
+  private DirectoryProvider<?>[] directoryProvider;
+  public void initialize(Properties properties, DirectoryProvider<?>[] providers) {
   this.directoryProvider = providers;
   if ( directoryProvider.length > 1) {
     throw new AssertionFailure("Using SingleDirectoryProviderSelectionStrategy with multiple DirectryProviders");
   }
 }

-  public DirectoryProvider[] getDirectoryProvidersForAllShards() {
+  public DirectoryProvider<?>[] getDirectoryProvidersForAllShards() {
   return directoryProvider;
 }

-  public DirectoryProvider getDirectoryProviderForAddition(Class entity, Serializable id, String idInString, Document document) {
+  public DirectoryProvider<?> getDirectoryProviderForAddition(Class<?> entity, Serializable id, String idInString, Document document) {
   return directoryProvider[0];
 }

-  public DirectoryProvider[] getDirectoryProvidersForDeletion(Class entity, Serializable id, String idInString) {
+  public DirectoryProvider<?>[] getDirectoryProvidersForDeletion(Class<?> entity, Serializable id, String idInString) {
   return directoryProvider;
 }


Modified: search/trunk/src/test/org/hibernate/search/test/configuration/UselessShardingStrategy.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/configuration/UselessShardingStrategy.java  2008-07-28 15:47:28 UTC (rev 14971)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/UselessShardingStrategy.java  2008-07-28 17:09:56 UTC (rev 14972)
@@(protected) @@
*/
public class UselessShardingStrategy implements IndexShardingStrategy {
 
-  public DirectoryProvider getDirectoryProviderForAddition(Class entity, Serializable id, String idInString, Document document) {
+  public DirectoryProvider<?> getDirectoryProviderForAddition(Class<?> entity, Serializable id, String idInString, Document document) {
   return null;
 }

-  public DirectoryProvider[] getDirectoryProvidersForAllShards() {
+  public DirectoryProvider<?>[] getDirectoryProvidersForAllShards() {
   return null;
 }

-  public DirectoryProvider[] getDirectoryProvidersForDeletion(Class entity, Serializable id, String idInString) {
+  public DirectoryProvider<?>[] getDirectoryProvidersForDeletion(Class<?> entity, Serializable id, String idInString) {
   return null;
 }

-  public void initialize(Properties properties, DirectoryProvider[] providers) {
+  public void initialize(Properties properties, DirectoryProvider<?>[] providers) {
 }

}

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits