diff --git a/hibernate-core/src/main/java/org/hibernate/Criteria.java b/hibernate-core/src/main/java/org/hibernate/Criteria.java index cefff41c1b..f8c57e93d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/Criteria.java +++ b/hibernate-core/src/main/java/org/hibernate/Criteria.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2008, 2013, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -20,12 +20,10 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate; -import java.util.List; -import javax.persistence.QueryHint; +import java.util.List; import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Criterion; @@ -34,6 +32,7 @@ import org.hibernate.criterion.Projection; import org.hibernate.sql.JoinType; import org.hibernate.transform.ResultTransformer; + /** * Criteria is a simplified API for retrieving entities * by composing Criterion objects. This is a very @@ -510,10 +509,10 @@ public interface Criteria extends CriteriaSpecification { /** - * Add a DB query hint to the SQL. These differ from JPA's {@link QueryHint}, which is specific to the JPA - * implementation and ignores DB vendor-specific hints. Instead, these are intended solely for the vendor-specific - * hints, such as Oracle's optimizers. Multiple query hints are supported; the Dialect will determine - * concatenation and placement. + * Add a DB query hint to the SQL. These differ from JPA's {@link javax.persistence.QueryHint}, which is specific + * to the JPA implementation and ignores DB vendor-specific hints. Instead, these are intended solely for the + * vendor-specific hints, such as Oracle's optimizers. Multiple query hints are supported; the Dialect will + * determine concatenation and placement. * * @param hint The database specific query hint to add. * @return this (for method chaining) diff --git a/hibernate-core/src/main/java/org/hibernate/Query.java b/hibernate-core/src/main/java/org/hibernate/Query.java index dc4b315d5a..f9f2a20e82 100644 --- a/hibernate-core/src/main/java/org/hibernate/Query.java +++ b/hibernate-core/src/main/java/org/hibernate/Query.java @@ -34,8 +34,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.QueryHint; - import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; @@ -215,10 +213,10 @@ public interface Query extends BasicQueryContract { public Query setComment(String comment); /** - * Add a DB query hint to the SQL. These differ from JPA's {@link QueryHint}, which is specific to the JPA - * implementation and ignores DB vendor-specific hints. Instead, these are intended solely for the vendor-specific - * hints, such as Oracle's optimizers. Multiple query hints are supported; the Dialect will determine - * concatenation and placement. + * Add a DB query hint to the SQL. These differ from JPA's {@link javax.persistence.QueryHint}, which is specific + * to the JPA implementation and ignores DB vendor-specific hints. Instead, these are intended solely for the + * vendor-specific hints, such as Oracle's optimizers. Multiple query hints are supported; the Dialect will + * determine concatenation and placement. * * @param hint The database specific query hint to add. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java index 47542569d0..4f884d969c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java @@ -25,24 +25,24 @@ package org.hibernate.boot.registry.internal; import java.util.LinkedHashSet; -import org.hibernate.integrator.internal.IntegratorServiceImpl; -import org.hibernate.integrator.spi.Integrator; -import org.hibernate.integrator.spi.IntegratorService; -import org.hibernate.internal.CoreMessageLogger; +import org.jboss.logging.Logger; + import org.hibernate.boot.registry.BootstrapServiceRegistry; -import org.hibernate.service.Service; -import org.hibernate.service.ServiceRegistry; import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.selector.internal.StrategySelectorImpl; import org.hibernate.boot.registry.selector.spi.StrategySelector; -import org.hibernate.service.internal.AbstractServiceRegistryImpl; +import org.hibernate.integrator.internal.IntegratorServiceImpl; +import org.hibernate.integrator.spi.Integrator; +import org.hibernate.integrator.spi.IntegratorService; +import org.hibernate.internal.CoreMessageLogger; +import org.hibernate.service.Service; +import org.hibernate.service.ServiceRegistry; import org.hibernate.service.spi.ServiceBinding; import org.hibernate.service.spi.ServiceException; import org.hibernate.service.spi.ServiceInitiator; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.Stoppable; -import org.jboss.logging.Logger; /** * {@link ServiceRegistry} implementation containing specialized "bootstrap" services, specifically: