Skip to content

catch exceptions in static initializer of AnalyzerGuru #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2018
Merged

catch exceptions in static initializer of AnalyzerGuru #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 63 additions & 58 deletions src/org/opensolaris/opengrok/analysis/AnalyzerGuru.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,67 +220,72 @@ public class AnalyzerGuru {
* though precise Matchers are run before imprecise ones.
*/
static {
FileAnalyzerFactory[] analyzers = {
DEFAULT_ANALYZER_FACTORY,
new IgnorantAnalyzerFactory(),
new BZip2AnalyzerFactory(),
new XMLAnalyzerFactory(),
MandocAnalyzerFactory.DEFAULT_INSTANCE,
TroffAnalyzerFactory.DEFAULT_INSTANCE,
new ELFAnalyzerFactory(),
JavaClassAnalyzerFactory.DEFAULT_INSTANCE,
new ImageAnalyzerFactory(),
JarAnalyzerFactory.DEFAULT_INSTANCE,
ZipAnalyzerFactory.DEFAULT_INSTANCE,
new TarAnalyzerFactory(),
new CAnalyzerFactory(),
new CSharpAnalyzerFactory(),
new VBAnalyzerFactory(),
new CxxAnalyzerFactory(),
new ErlangAnalyzerFactory(),
new ShAnalyzerFactory(),
new PowershellAnalyzerFactory(),
PlainAnalyzerFactory.DEFAULT_INSTANCE,
new UuencodeAnalyzerFactory(),
new GZIPAnalyzerFactory(),
new JavaAnalyzerFactory(),
new JavaScriptAnalyzerFactory(),
new KotlinAnalyzerFactory(),
new SwiftAnalyzerFactory(),
new JsonAnalyzerFactory(),
new PythonAnalyzerFactory(),
new RustAnalyzerFactory(),
new PerlAnalyzerFactory(),
new PhpAnalyzerFactory(),
new LispAnalyzerFactory(),
new TclAnalyzerFactory(),
new ScalaAnalyzerFactory(),
new ClojureAnalyzerFactory(),
new SQLAnalyzerFactory(),
new PLSQLAnalyzerFactory(),
new FortranAnalyzerFactory(),
new HaskellAnalyzerFactory(),
new GolangAnalyzerFactory(),
new LuaAnalyzerFactory(),
new PascalAnalyzerFactory(),
new AdaAnalyzerFactory(),
new RubyAnalyzerFactory(),
new EiffelAnalyzerFactory()
};

for (FileAnalyzerFactory analyzer : analyzers) {
registerAnalyzer(analyzer);
}

for (FileAnalyzerFactory analyzer : analyzers) {
if (analyzer.getName() != null && !analyzer.getName().isEmpty()) {
fileTypeDescriptions.put(analyzer.getAnalyzer().getFileTypeName(), analyzer.getName());
try {
FileAnalyzerFactory[] analyzers = {
DEFAULT_ANALYZER_FACTORY,
new IgnorantAnalyzerFactory(),
new BZip2AnalyzerFactory(),
new XMLAnalyzerFactory(),
MandocAnalyzerFactory.DEFAULT_INSTANCE,
TroffAnalyzerFactory.DEFAULT_INSTANCE,
new ELFAnalyzerFactory(),
JavaClassAnalyzerFactory.DEFAULT_INSTANCE,
new ImageAnalyzerFactory(),
JarAnalyzerFactory.DEFAULT_INSTANCE,
ZipAnalyzerFactory.DEFAULT_INSTANCE,
new TarAnalyzerFactory(),
new CAnalyzerFactory(),
new CSharpAnalyzerFactory(),
new VBAnalyzerFactory(),
new CxxAnalyzerFactory(),
new ErlangAnalyzerFactory(),
new ShAnalyzerFactory(),
new PowershellAnalyzerFactory(),
PlainAnalyzerFactory.DEFAULT_INSTANCE,
new UuencodeAnalyzerFactory(),
new GZIPAnalyzerFactory(),
new JavaAnalyzerFactory(),
new JavaScriptAnalyzerFactory(),
new KotlinAnalyzerFactory(),
new SwiftAnalyzerFactory(),
new JsonAnalyzerFactory(),
new PythonAnalyzerFactory(),
new RustAnalyzerFactory(),
new PerlAnalyzerFactory(),
new PhpAnalyzerFactory(),
new LispAnalyzerFactory(),
new TclAnalyzerFactory(),
new ScalaAnalyzerFactory(),
new ClojureAnalyzerFactory(),
new SQLAnalyzerFactory(),
new PLSQLAnalyzerFactory(),
new FortranAnalyzerFactory(),
new HaskellAnalyzerFactory(),
new GolangAnalyzerFactory(),
new LuaAnalyzerFactory(),
new PascalAnalyzerFactory(),
new AdaAnalyzerFactory(),
new RubyAnalyzerFactory(),
new EiffelAnalyzerFactory()
};

for (FileAnalyzerFactory analyzer : analyzers) {
registerAnalyzer(analyzer);
}
}

string_ft_stored_nanalyzed_norms.setOmitNorms(false);
string_ft_nstored_nanalyzed_norms.setOmitNorms(false);
for (FileAnalyzerFactory analyzer : analyzers) {
if (analyzer.getName() != null && !analyzer.getName().isEmpty()) {
fileTypeDescriptions.put(analyzer.getAnalyzer().getFileTypeName(), analyzer.getName());
}
}

string_ft_stored_nanalyzed_norms.setOmitNorms(false);
string_ft_nstored_nanalyzed_norms.setOmitNorms(false);
} catch (Throwable t) {
LOGGER.log(Level.SEVERE,
"exception hit when constructing AnalyzerGuru static", t);
throw t;
}
}

public static Map<String, FileAnalyzerFactory> getExtensionsMap() {
Expand Down
9 changes: 9 additions & 0 deletions test/org/opensolaris/opengrok/analysis/AnalyzerGuruTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.TreeMap;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.junit.Assert;
import org.junit.Test;
import org.opensolaris.opengrok.analysis.archive.ZipAnalyzer;
import org.opensolaris.opengrok.analysis.c.CxxAnalyzerFactory;
Expand All @@ -53,6 +56,12 @@
* Tests for the functionality provided by the AnalyzerGuru class.
*/
public class AnalyzerGuruTest {
@Test
public void testGetFileTypeDescriptions() {
Map<String,String> map = AnalyzerGuru.getfileTypeDescriptions();
Assert.assertTrue(map.size() > 0);
}

/**
* Test that we get the correct analyzer if the file name exactly matches a
* known extension.
Expand Down