HSEARCH-1326 Fix NeedBraces checkstyle violations

Author: DavideD

infinispan/src/test/java/org/hibernate/search/infinispan/sharedIndex/Device.java

@@ -69,32 +69,47 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if ( this == obj )
+		if ( this == obj ) {
 			return true;
-		if ( obj == null )
+		}
+		if ( obj == null ) {
 			return false;
-		if ( !( obj instanceof Device ) )
+		}
+		if ( !( obj instanceof Device ) ) {
 			return false;
+		}
 		Device other = (Device) obj;
 
 		if ( manufacturer == null ) {
-			if ( other.manufacturer != null )
+			if ( other.manufacturer != null ) {
 				return false;
+			}
+		}
+		else {
+			if ( !manufacturer.equals( other.manufacturer ) ) {
+				return false;
+			}
 		}
-		else if ( !manufacturer.equals( other.manufacturer ) )
-			return false;
 		if ( model == null ) {
-			if ( other.model != null )
+			if ( other.model != null ) {
 				return false;
+			}
+		}
+		else {
+			if ( !model.equals( other.model ) ) {
+				return false;
+			}
 		}
-		else if ( !model.equals( other.model ) )
-			return false;
 		if ( serialNumber == null ) {
-			if ( other.serialNumber != null )
+			if ( other.serialNumber != null ) {
 				return false;
+			}
+		}
+		else {
+			if ( !serialNumber.equals( other.serialNumber ) ) {
+				return false;
+			}
 		}
-		else if ( !serialNumber.equals( other.serialNumber ) )
-			return false;
 		return true;
 	}
 }

orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java

@@ -136,8 +136,9 @@ private void loadAllIdentifiers(final StatelessSession session) throws Interrupt
 		if ( objectsLimit != 0 && objectsLimit < totalCount ) {
 			totalCount = objectsLimit;
 		}
-		if ( log.isDebugEnabled() )
+		if ( log.isDebugEnabled() ) {
 			log.debugf( "going to fetch %d primary keys", totalCount);
+		}
 		monitor.addToTotalCount( totalCount );
 
 		Criteria criteria = session

orm/src/main/java/org/hibernate/search/cfg/impl/SearchConfigurationFromHibernateCore.java

@@ -50,7 +50,9 @@ public class SearchConfigurationFromHibernateCore extends SearchConfigurationBas
 	private ReflectionManager reflectionManager;
 
 	public SearchConfigurationFromHibernateCore(org.hibernate.cfg.Configuration cfg) {
-		if ( cfg == null ) throw new NullPointerException( "Configuration is null" );
+		if ( cfg == null ) {
+			throw new NullPointerException( "Configuration is null" );
+		}
 		this.cfg = cfg;
 	}
 
@@ -105,7 +107,9 @@ private ClassIterator(Iterator hibernatePersistentClassIterator) {
 
 		public boolean hasNext() {
 			//we need to read the next non null one. getMappedClass() can return null and should be ignored
-			if ( future != null) return true;
+			if ( future != null) {
+				return true;
+			}
 			do {
 				if ( ! hibernatePersistentClassIterator.hasNext() ) {
 					future = null;
@@ -120,7 +124,9 @@ public boolean hasNext() {
 
 		public Class<?> next() {
 			//run hasNext to init the next element
-			if ( ! hasNext() ) throw new NoSuchElementException();
+			if ( ! hasNext() ) {
+				throw new NoSuchElementException();
+			}
 			Class<?> result = future;
 			future = null;
 			return result;

orm/src/main/java/org/hibernate/search/query/hibernate/impl/IteratorImpl.java

@@ -50,7 +50,9 @@ public IteratorImpl(List<EntityInfo> entityInfos, Loader loader) {
 
 	//side effect is to set up next
 	public boolean hasNext() {
-		if ( nextObjectIndex == index ) return next != null;
+		if ( nextObjectIndex == index ) {
+			return next != null;
+		}
 		next = null;
 		nextObjectIndex = -1;
 		do {
@@ -73,7 +75,9 @@ public boolean hasNext() {
 
 	public Object next() {
 		//hasNext() has side effect
-		if ( !hasNext() ) throw new NoSuchElementException( "Out of boundaries" );
+		if (!hasNext()) {
+			throw new NoSuchElementException( "Out of boundaries" );
+		}
 		index++;
 		return next;
 	}

orm/src/main/java/org/hibernate/search/query/hibernate/impl/LookupObjectsInitializer.java

@@ -67,7 +67,8 @@ public void initializeObjects(EntityInfo[] entityInfos,
 		for ( EntityInfo entityInfo : entityInfos ) {
 			ObjectLoaderHelper.load( entityInfo, session );
 		}
-		if ( traceEnabled )
+		if ( traceEnabled ) {
 			log.tracef( "Initialized %d objects by lookup method.", maxResults );
+		}
 	}
 }

orm/src/main/java/org/hibernate/search/query/hibernate/impl/MultiClassesQueryLoader.java

@@ -95,7 +95,9 @@ public Object executeLoad(EntityInfo entityInfo) {
 	}
 
 	public List executeLoad(EntityInfo... entityInfos) {
-		if ( entityInfos.length == 0 ) return Collections.EMPTY_LIST;
+		if ( entityInfos.length == 0 ) {
+			return Collections.EMPTY_LIST;
+		}
 		if ( entityInfos.length == 1 ) {
 			final Object entity = load( entityInfos[0] );
 			if ( entity == null ) {
@@ -125,7 +127,9 @@ public List executeLoad(EntityInfo... entityInfos) {
 					break; //we stop looping for the right bucket
 				}
 			}
-			if (!found) throw new AssertionFailure( "Could not find root entity for " + clazz );
+			if (!found) {
+				throw new AssertionFailure( "Could not find root entity for " + clazz );
+			}
 		}
 
 		//initialize objects by bucket
@@ -155,7 +159,9 @@ private static class RootEntityMetadata {
 		RootEntityMetadata(Class<?> rootEntity, SearchFactoryImplementor searchFactoryImplementor) {
 			this.rootEntity = rootEntity;
 			EntityIndexBinding provider = searchFactoryImplementor.getIndexBinding( rootEntity );
-			if ( provider == null) throw new AssertionFailure("Provider not found for class: " + rootEntity);
+			if ( provider == null) {
+				throw new AssertionFailure("Provider not found for class: " + rootEntity);
+			}
 			this.mappedSubclasses = provider.getDocumentBuilder().getMappedSubclasses();
 			this.criteria = null; //default
 		}

orm/src/main/java/org/hibernate/search/query/hibernate/impl/ScrollableResultsImpl.java

@@ -124,8 +124,9 @@ private LoadedObject ensureCurrentLoaded() {
 				entityInfosToLoad.add( lo.getEntityInfo( x ) );
 				resultsContext[arrayIdx] = lo;
 				sizeToLoad++;
-				if ( sizeToLoad >= fetchSize )
+				if ( sizeToLoad >= fetchSize ) {
 					break;
+				}
 			}
 		}
 		//preload efficiently by batches:
@@ -230,7 +231,9 @@ public Object[] get() throws HibernateException {
 		// (or 0 I can't remember) but we can't
 		// do that since we have to make up for
 		// an Object[]. J.G
-		if ( current < first || current > max ) return null;
+		if ( current < first || current > max ) {
+			return null;
+		}
 		LoadedObject cacheEntry = ensureCurrentLoaded();
 		return cacheEntry.getManagedResult( current );
 	}
@@ -404,7 +407,9 @@ public TimeZone getTimeZone(int col) {
 	}
 
 	public int getRowNumber() {
-		if ( max < first ) return -1;
+		if ( max < first ) {
+			return -1;
+		}
 		return current - first;
 	}
 
@@ -437,7 +442,9 @@ private Object[] getManagedResult(int x) {
 			}
 			else {
 				Object loaded = loader.load( entityInfo );
-				if ( ! loaded.getClass().isArray() ) loaded = new Object[] { loaded };
+				if ( ! loaded.getClass().isArray() ) {
+					loaded = new Object[] { loaded };
+				}
 				objects = (Object[]) loaded;
 				this.entity = new SoftReference<Object[]>( objects );
 				return objects;
@@ -473,8 +480,9 @@ private boolean areAllEntitiesManaged(Object[] objects,	EntityInfo entityInfo) {
 			for ( int idx : entityInfo.getIndexesOfThis() ) {
 				Object o = objects[idx];
 				//TODO improve: is it useful to check for proxies and have them reassociated to persistence context?
-				if ( ! hibSession.contains( o ) )
+				if ( ! hibSession.contains( o ) ) {
 					return false;
+				}
 			}
 			return true;
 		}

orm/src/main/java/org/hibernate/search/query/hibernate/impl/SecondLevelCacheObjectsInitializer.java

@@ -56,7 +56,9 @@ public void initializeObjects(EntityInfo[] entityInfos,
 		//Do not call isTimeOut here as the caller might be the last biggie on the list.
 		final int maxResults = entityInfos.length;
 		if ( maxResults == 0 ) {
-			if ( traceEnabled ) log.tracef( "No object to initialize", maxResults );
+			if ( traceEnabled ) {
+				log.tracef( "No object to initialize", maxResults );
+			}
 			return;
 		}
 
@@ -88,7 +90,9 @@ public void initializeObjects(EntityInfo[] entityInfos,
 		//update entityInfos to only contains the remaining ones
 		final int remainingSize = remainingEntityInfos.size();
 
-		if ( traceEnabled ) log.tracef( "Initialized %d objects out of %d in the second level cache", maxResults - remainingSize, maxResults );
+		if ( traceEnabled ) {
+			log.tracef( "Initialized %d objects out of %d in the second level cache", maxResults - remainingSize, maxResults );
+		}
 		if ( remainingSize > 0 ) {
 			delegate.initializeObjects(
 					remainingEntityInfos.toArray( new EntityInfo[remainingSize] ),

orm/src/test/java/org/hibernate/search/test/PurgeTest.java

@@ -78,8 +78,9 @@ public void testPurge() throws Exception {
 		assertEquals( "incorrect test record count", 1, results.size() );
 		assertEquals( "incorrect test record", 2, ( (Clock) results.get( 0 ) ).getId().intValue() );
 
-		for ( Object element : s.createQuery( "from java.lang.Object" ).list() )
+		for ( Object element : s.createQuery( "from java.lang.Object" ).list() ) {
 			s.delete( element );
+		}
 		tx.commit();
 		s.close();
 	}
@@ -119,7 +120,9 @@ public void testPurgeAll() throws Exception {
 		results = hibQuery.list();
 		assertEquals( "incorrect class purged", 2, results.size() );
 
-		for (Object element : s.createQuery( "from java.lang.Object" ).list()) s.delete( element );
+		for (Object element : s.createQuery( "from java.lang.Object" ).list()) {
+			s.delete( element );
+		}
 		tx.commit();
 		s.close();
 	}

orm/src/test/java/org/hibernate/search/test/SerializationTestHelper.java

@@ -106,15 +106,19 @@ public int hashCode() {
 
 			@Override
 			public boolean equals(Object obj) {
-				if (this == obj)
+				if (this == obj) {
 					return true;
-				if (obj == null)
+				}
+				if (obj == null) {
 					return false;
-				if (getClass() != obj.getClass())
+				}
+				if (getClass() != obj.getClass()) {
 					return false;
+				}
 				final TestInnerClass other = (TestInnerClass) obj;
-				if (v != other.v)
+				if (v != other.v) {
 					return false;
+				}
 				return true;
 			}
 		}