Remove deprecated APIs after #12066; this also removes another one missed to be removed before

This commit is contained in:
Uwe Schindler 2023-01-05 11:53:16 +01:00
parent 7f483bd618
commit 5fccaec166
2 changed files with 0 additions and 84 deletions

View File

@ -60,41 +60,6 @@ public abstract class StopwordAnalyzerBase extends Analyzer {
this(null);
}
/**
* Creates a CharArraySet from a file resource associated with a class. (See {@link
* Class#getResourceAsStream(String)}).
*
* @param ignoreCase <code>true</code> if the set should ignore the case of the stopwords,
* otherwise <code>false</code>
* @param aClass a class that is associated with the given stopwordResource
* @param resource name of the resource file associated with the given class
* @param comment comment string to ignore in the stopword file
* @return a CharArraySet containing the distinct stopwords from the given file
* @throws IOException if loading the stopwords throws an {@link IOException}
* @deprecated {@link Class#getResourceAsStream(String)} is caller sensitive and cannot load
* resources across Java Modules. Please call the {@code getResourceAsStream()} and {@link
* WordlistLoader#getWordSet(Reader, String, CharArraySet)} or other methods directly.
*/
@Deprecated(forRemoval = true, since = "9.1")
protected static CharArraySet loadStopwordSet(
final boolean ignoreCase,
final Class<? extends Analyzer> aClass,
final String resource,
final String comment)
throws IOException {
var argModule = aClass.getModule();
if (argModule.isNamed() && argModule != StopwordAnalyzerBase.class.getModule()) {
throw new UnsupportedOperationException(
"loadStopwordSet(class,...) does not work when Java Module System is enabled.");
}
try (Reader reader =
IOUtils.getDecodingReader(
IOUtils.requireResourceNonNull(aClass.getResourceAsStream(resource), resource),
StandardCharsets.UTF_8)) {
return WordlistLoader.getWordSet(reader, comment, new CharArraySet(16, ignoreCase));
}
}
/**
* Creates a CharArraySet from a path.
*

View File

@ -221,32 +221,6 @@ public class MMapDirectory extends FSDirectory {
assert (1L << chunkSizePower) > (maxChunkSize / 2);
}
/**
* This method is retired, see deprecation notice!
*
* @throws UnsupportedOperationException as setting cannot be changed
* @deprecated Please use new system property {@link #ENABLE_UNMAP_HACK_SYSPROP} instead
*/
@Deprecated(forRemoval = true)
public void setUseUnmap(final boolean useUnmapHack) {
if (useUnmapHack != UNMAP_SUPPORTED) {
throw new UnsupportedOperationException(
"It is no longer possible configure unmap hack for directory instances. Please use the global system property: "
+ ENABLE_UNMAP_HACK_SYSPROP);
}
}
/**
* Returns <code>true</code>, if the unmap workaround is enabled.
*
* @see #setUseUnmap
* @deprecated use {@link #UNMAP_SUPPORTED}
*/
@Deprecated
public boolean getUseUnmap() {
return UNMAP_SUPPORTED;
}
/**
* Configure which files to preload in physical memory upon opening. The default implementation
* does not preload anything. The behavior is best effort and operating system-dependent.
@ -260,29 +234,6 @@ public class MMapDirectory extends FSDirectory {
this.preload = preload;
}
/**
* Configure whether to preload files on this {@link MMapDirectory} into physical memory upon
* opening. The behavior is best effort and operating system-dependent.
*
* @deprecated Use {@link #setPreload(BiPredicate)} instead which provides more granular control.
*/
@Deprecated
public void setPreload(boolean preload) {
this.preload = preload ? ALL_FILES : NO_FILES;
}
/**
* Return whether files are loaded into physical memory upon opening.
*
* @deprecated This information is no longer reliable now that preloading is more granularly
* configured via a predicate.
* @see #setPreload(BiPredicate)
*/
@Deprecated
public boolean getPreload() {
return preload == ALL_FILES;
}
/**
* Returns the current mmap chunk size.
*