Commit b5ccc16

committed

make CF happy

1 parent c164b9c commit b5ccc16Copy full SHA for b5ccc16

File tree

-9

lines changed

hibernate-core/src/main/java/org/hibernate
- engine/spi
  - ActionQueue.java
- internal/util/collections
  - ArrayHelper.java

-9

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@`
`54`	`54`	`import org.checkerframework.checker.nullness.qual.NonNull;`
`55`	`55`	`import org.checkerframework.checker.nullness.qual.Nullable;`
`56`	`56`
`57`		`-import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;`
`58`	`57`	`import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;`
`59`	`58`
`60`	`59`	`/**`
`@@ -664,10 +663,8 @@ private <E extends ComparableExecutable> void executeActions(@Nullable Executabl`
`664`	`663`	`// Strictly speaking, only a subset of the list may have been processed if a RuntimeException occurs.`
`665`	`664`	`// We still invalidate all spaces. I don't see this as a big deal - after all, RuntimeExceptions are`
`666`	`665`	`// unexpected.`
`667`		`- invalidateSpaces( queue.getQuerySpaces().toArray( EMPTY_STRING_ARRAY ) );`
	`666`	`+ invalidateSpaces( queue.getQuerySpaces().toArray( newString[0] ) );`
`668`	`667`	`}`
`669`		`- // @NonNull String @Nullable [] - array nullable, elements not`
`670`		`- // @Nullable String @NonNull [] - elements nullable, array not`
`671`	`668`	`}`
`672`	`669`
`673`	`670`	`queue.clear();`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import java.util.List;`
`11`	`11`	`import java.util.function.Consumer;`
`12`	`12`
`13`		`-import org.checkerframework.checker.nullness.qual.NonNull;`
`14`	`13`	`import org.hibernate.internal.build.AllowReflection;`
`15`	`14`	`import org.hibernate.type.Type;`
`16`	`15`
`@@ -239,12 +238,12 @@ public static <T> void addAll(Collection<T> collection, T[] array) {`
`239`	`238`	`collection.addAll( asList( array ) );`
`240`	`239`	`}`
`241`	`240`
`242`		`- public static final String@NonNull[] EMPTY_STRING_ARRAY = {};`
	`241`	`+ public static final String[] EMPTY_STRING_ARRAY = {};`
`243`	`242`	`public static final int[] EMPTY_INT_ARRAY = {};`
`244`	`243`	`public static final boolean[] EMPTY_BOOLEAN_ARRAY = {};`
`245`		`- public static final Class<?>@NonNull[] EMPTY_CLASS_ARRAY = {};`
`246`		`- public static final Object@NonNull[] EMPTY_OBJECT_ARRAY = {};`
`247`		`- public static final Type@NonNull[] EMPTY_TYPE_ARRAY = {};`
	`244`	`+ public static final Class<?>[] EMPTY_CLASS_ARRAY = {};`
	`245`	`+ public static final Object[] EMPTY_OBJECT_ARRAY = {};`
	`246`	`+ public static final Type[] EMPTY_TYPE_ARRAY = {};`
`248`	`247`	`public static final byte[] EMPTY_BYTE_ARRAY = {};`
`249`	`248`
`250`	`249`

Comments

(0)