Review and tidy solr/modules/scripting code#4839

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

Open
epugh wants to merge 1 commit into
base:main
Choose a base branch
from
+23 −24
Open

Review and tidy solr/modules/scripting code #4839

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
12 changes: 6 additions & 6 deletions ...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

private List<ScriptFile> scriptFiles;

/** if nonnull, this is an override for the engine for all scripts */
/** if non-null, this is an override for the engine for all scripts */
private String engineName = null;

private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
@Override
public UpdateRequestProcessor getInstance(
SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
List<EngineInfo> scriptEngines = null;
List<EngineInfo> scriptEngines;

scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
"Engine "
+ ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
+ " does not support function invocation (via Invocable): "
+ engine.getClass().toString()
+ engine.getClass()
+ " ("
+ engine.getFactory().getEngineName()
+ ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
}

/**
* For error messages - returns null if there are any exceptions of any kind building the string
* For error messages - returns null if there are any exceptions registered building the string
* (or of the list is empty for some unknown reason).
*
* @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
for (EngineInfo engine : engines) {
try {
Object result = engine.getEngine().invokeFunction(name, cmd);
if (null != result && result instanceof Boolean) {
if (!((Boolean) result).booleanValue()) {
if (result instanceof Boolean) {
if (!(Boolean) result) {
return false;
}
}
Expand Down
4 changes: 2 additions & 2 deletions solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

/** singleton */
private TransformerProvider() {
// tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
// currently, we only cache the last used XSLT transform, and blindly recompile it
// once cacheLifetimeSeconds expires
log.warn(
"The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
// not the cleanest way to achieve this
// no need to synchronize access to context, right?
// Nothing else happens with it at the same time
// Nothing else happens to it at the same time
final Map<Object, Object> ctx = request.getContext();
Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
if (result == null) {
Expand Down
8 changes: 4 additions & 4 deletions solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

@Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
Transformer t = null;
Transformer t;
try {
t = getTransformer(request);
} catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
}

String mediaType = t.getOutputProperty("media-type");
if (mediaType == null || mediaType.length() == 0) {
if (mediaType == null || mediaType.isEmpty()) {
// This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
// if the XSLT transform does not contain an xsl:output element. Not sure
// if the XSLT transform does not contain a xsl:output element. Not sure
// if this is standard behavior or if it's just my JVM/libraries
mediaType = DEFAULT_CONTENT_TYPE;
}

if (!mediaType.contains("charset")) {
String encoding = t.getOutputProperty("encoding");
if (encoding == null || encoding.length() == 0) {
if (encoding == null || encoding.isEmpty()) {
encoding = "UTF-8";
}
mediaType = mediaType + "; charset=" + encoding;
Expand Down
2 changes: 1 addition & 1 deletion ...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<updateRequestProcessorChain name="force-script-engine" default="true">
<processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
<str name="engine">giberish</str>
<str name="engine">gibberish</str>
<str name="script">missleading.extension.updateprocessor.js.txt</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
Expand Down
2 changes: 1 addition & 1 deletion solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
private ScriptEngineManager manager;

@BeforeClass
public static void beforeClass() throws Exception {
public static void beforeClass() {
assumeFalse(
"https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
Constants.MAC_OS_X);
Expand Down
13 changes: 6 additions & 7 deletions ...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
SolrCore core = h.getCore();
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
final ScriptUpdateProcessorFactory factory =
((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
final List<String> functionMessages = new ArrayList<>();
factory.setScriptEngineCustomizer(
new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
});
assertNotNull(chained);

SolrInputDocument d =
processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
final ScriptUpdateProcessorFactory factory =
((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
final List<String> functionMessages = new ArrayList<>();
ScriptEngineCustomizer customizer =
new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
}

public void testPropogatedException() throws Exception {
public void testPropagatedException() {
final String chain = "error-on-add";
SolrException e =
expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
0 < e.getMessage().indexOf("no-soup-fo-you"));
}

public void testMissingFunctions() throws Exception {
public void testMissingFunctions() {
final String chain = "missing-functions";
SolrException e =
expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

@SuppressWarnings("removal")
@SuppressForbidden(reason = "Deprecated for removal in future Java version")
public void testScriptSandbox() throws Exception {
public void testScriptSandbox() {
assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
expectThrows(
SecurityException.class,
Expand Down
4 changes: 2 additions & 2 deletions ...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

public void testBogusScriptEngine() throws Exception {
// sanity check
Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

assertConfigs(
"bad-solrconfig-bogus-scriptengine-name.xml",
"schema.xml",
getFile("scripting/solr/collection1").getParent().toString(),
"giberish");
"gibberish");
}

public void testMissingScriptFile() throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion ...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

AddUpdateCommand add = p.addCommands.get(0);
AddUpdateCommand add = p.addCommands.getFirst();
assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
req.close();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Review and tidy solr/modules/scripting code#4839

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

 Open

epugh
wants to merge
1
commit into

base:main
Choose a base branch

from


+23

−24

 Open


Review and tidy solr/modules/scripting code
#4839
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


12 changes: 6 additions & 6 deletions
...les/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory

 private List<ScriptFile> scriptFiles;

 /** if nonnull, this is an override for the engine for all scripts */
 /** if non-null, this is an override for the engine for all scripts */
 private String engineName = null;

 private Object params = null;
Expand DownExpand Up@@ -200,7 +200,7 @@ public void init(NamedList<?> args) {
 @Override
 public UpdateRequestProcessor getInstance(
 SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
 List<EngineInfo> scriptEngines = null;
 List<EngineInfo> scriptEngines;

 scriptEngines = initEngines(req, rsp);

Expand DownExpand Up@@ -286,7 +286,7 @@ private List<EngineInfo> initEngines(SolrQueryRequest req, SolrQueryResponse rsp
 "Engine "
 + ((null != engineName) ? engineName : ("for script " + scriptFile.getFileName()))
 + " does not support function invocation (via Invocable): "
 + engine.getClass().toString()
 + engine.getClass()
 + " ("
 + engine.getFactory().getEngineName()
 + ")";
Expand DownExpand Up@@ -335,7 +335,7 @@ private static <T> void doPrivilegedExceptionAction(PrivilegedExceptionAction<T>
 }

 /**
 * For error messages - returns null if there are any exceptions of any kind building the string
 * For error messages - returns null if there are any exceptions registered building the string
 * (or of the list is empty for some unknown reason).
 *
 * @param ext - if true, list of extensions, otherwise a list of engine names
Expand DownExpand Up@@ -437,8 +437,8 @@ private boolean invokeFunctionUnsafe(String name, Object... cmd) {
 for (EngineInfo engine : engines) {
 try {
 Object result = engine.getEngine().invokeFunction(name, cmd);
 if (null != result && result instanceof Boolean) {
 if (!((Boolean) result).booleanValue()) {
 if (result instanceof Boolean) {
 if (!(Boolean) result) {
 return false;
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ class TransformerProvider {

 /** singleton */
 private TransformerProvider() {
 // tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
 // currently, we only cache the last used XSLT transform, and blindly recompile it
 // once cacheLifetimeSeconds expires
 log.warn(
 "The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
Expand All@@ -74,7 +74,7 @@ static Transformer getTransformer(
 SolrQueryRequest request, String xslt, int xsltCacheLifetimeSeconds) throws IOException {
 // not the cleanest way to achieve this
 // no need to synchronize access to context, right?
 // Nothing else happens with it at the same time
 // Nothing else happens to it at the same time
 final Map<Object, Object> ctx = request.getContext();
 Transformer result = (Transformer) ctx.get(CONTEXT_TRANSFORMER_KEY);
 if (result == null) {
Expand Down

8 changes: 4 additions & 4 deletions
solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ public void init(NamedList<?> n) {

 @Override
 public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
 Transformer t = null;
 Transformer t;
 try {
 t = getTransformer(request);
 } catch (Exception e) {
Expand All@@ -66,16 +66,16 @@ public String getContentType(SolrQueryRequest request, SolrQueryResponse respons
 }

 String mediaType = t.getOutputProperty("media-type");
 if (mediaType == null || mediaType.length() == 0) {
 if (mediaType == null || mediaType.isEmpty()) {
 // This did not happen in my tests, mediaTypeFromXslt is set to "text/xml"
 // if the XSLT transform does not contain an xsl:output element. Not sure
 // if the XSLT transform does not contain a xsl:output element. Not sure
 // if this is standard behavior or if it's just my JVM/libraries
 mediaType = DEFAULT_CONTENT_TYPE;
 }

 if (!mediaType.contains("charset")) {
 String encoding = t.getOutputProperty("encoding");
 if (encoding == null || encoding.length() == 0) {
 if (encoding == null || encoding.isEmpty()) {
 encoding = "UTF-8";
 }
 mediaType = mediaType + "; charset=" + encoding;
Expand Down

2 changes: 1 addition & 1 deletion
...src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

 <updateRequestProcessorChain name="force-script-engine" default="true">
 <processor class="org.apache.solr.scripting.update.ScriptUpdateProcessorFactory">
 <str name="engine">giberish</str>
 <str name="engine">gibberish</str>
 <str name="script">missleading.extension.updateprocessor.js.txt</str>
 </processor>
 <processor class="solr.RunUpdateProcessorFactory" />
Expand Down

2 changes: 1 addition & 1 deletion
solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class ScriptEngineTest extends SolrTestCase {
 private ScriptEngineManager manager;

 @BeforeClass
 public static void beforeClass() throws Exception {
 public static void beforeClass() {
 assumeFalse(
 "https://twitter.com/UweSays/status/260487231880433664 / SOLR-4233: OS X bogusly starts AWT!",
 Constants.MAC_OS_X);
Expand Down

13 changes: 6 additions & 7 deletions
...scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ public void testSingleScript() throws Exception {
 SolrCore core = h.getCore();
 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 factory.setScriptEngineCustomizer(
 new ScriptEngineCustomizer() {
Expand All@@ -85,8 +85,7 @@ public void customize(ScriptEngine engine) {
 });
 assertNotNull(chained);

 SolrInputDocument d =
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));
 processAdd("single-script", doc(f("id", "1"), f("name", " foo "), f("subject", "bar")));

 processCommit("run-no-scripts");

Expand All@@ -111,7 +110,7 @@ public void testMultipleScripts() throws Exception {

 UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
 final ScriptUpdateProcessorFactory factory =
 ((ScriptUpdateProcessorFactory) chained.getProcessors().get(0));
 ((ScriptUpdateProcessorFactory) chained.getProcessors().getFirst());
 final List<String> functionMessages = new ArrayList<>();
 ScriptEngineCustomizer customizer =
 new ScriptEngineCustomizer() {
Expand DownExpand Up@@ -202,7 +201,7 @@ public void testForceEngine() throws Exception {
 assertEquals(chain + " didn't add integer field", 42, d.getFieldValue("script_added_i"));
 }

 public void testPropogatedException() throws Exception {
 public void testPropagatedException() {
 final String chain = "error-on-add";
 SolrException e =
 expectThrows(
Expand All@@ -213,7 +212,7 @@ public void testPropogatedException() throws Exception {
 0 < e.getMessage().indexOf("no-soup-fo-you"));
 }

 public void testMissingFunctions() throws Exception {
 public void testMissingFunctions() {
 final String chain = "missing-functions";
 SolrException e =
 expectThrows(
Expand All@@ -233,7 +232,7 @@ public void testJavaScriptCompatibility() throws Exception {

 @SuppressWarnings("removal")
 @SuppressForbidden(reason = "Deprecated for removal in future Java version")
 public void testScriptSandbox() throws Exception {
 public void testScriptSandbox() {
 assumeTrue("This test only works with security manager", System.getSecurityManager() != null);
 expectThrows(
 SecurityException.class,
Expand Down

4 changes: 2 additions & 2 deletions
...ting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,13 +29,13 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {

 public void testBogusScriptEngine() throws Exception {
 // sanity check
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("giberish"));
 Assume.assumeTrue(null == (new ScriptEngineManager()).getEngineByName("gibberish"));

 assertConfigs(
 "bad-solrconfig-bogus-scriptengine-name.xml",
 "schema.xml",
 getFile("scripting/solr/collection1").getParent().toString(),
 "giberish");
 "gibberish");
 }

 public void testMissingScriptFile() throws Exception {
Expand Down

2 changes: 1 addition & 1 deletion
...dules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ public void testEntities() throws Exception {
 ContentStreamLoader loader = new XSLTUpdateRequestHandler.XsltXMLLoader().init(null);
 loader.load(req, rsp, new ContentStreamBase.StringStream(xml), p);

 AddUpdateCommand add = p.addCommands.get(0);
 AddUpdateCommand add = p.addCommands.getFirst();
 assertEquals("12345", add.solrDoc.getField("id").getFirstValue());
 assertEquals("zzz", add.solrDoc.getField("foo_s").getFirstValue());
 req.close();
Expand Down
Loading