Skip to content

Commit 1c83003

Browse files
idodeclareVladimir Kotal
idodeclare
authored and
Vladimir Kotal
committed
Extract to QueryParameters named literals
1 parent 1a0db5e commit 1c83003

File tree

26 files changed

+543
-233
lines changed

26 files changed

+543
-233
lines changed

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/JFlexNonXref.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
23-
* Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
23+
* Portions Copyright (c) 2017-2018, 2020, Chris Fraire <[email protected]>.
2424
*/
2525

2626
package org.opengrok.indexer.analysis;
@@ -36,6 +36,7 @@
3636
import org.opengrok.indexer.configuration.RuntimeEnvironment;
3737
import org.opengrok.indexer.history.Annotation;
3838
import org.opengrok.indexer.util.StringUtils;
39+
import org.opengrok.indexer.web.QueryParameters;
3940
import org.opengrok.indexer.web.Util;
4041

4142
/**
@@ -258,7 +259,8 @@ protected void appendLink(String url, boolean doEndingPushback,
258259

259260
protected String getProjectPostfix(boolean encoded) {
260261
String amp = encoded ? "&amp;" : "&";
261-
return project == null ? "" : (amp + "project=" + project.getName());
262+
return project == null ? "" : (amp + QueryParameters.PROJECT_SEARCH_PARAM_EQ +
263+
project.getName());
262264
}
263265

264266
protected void startScope() {

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/JFlexXref.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
23-
* Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
23+
* Portions Copyright (c) 2017-2018, 2020, Chris Fraire <[email protected]>.
2424
*/
2525
package org.opengrok.indexer.analysis;
2626

@@ -31,6 +31,7 @@
3131
import org.opengrok.indexer.configuration.Project;
3232
import org.opengrok.indexer.configuration.RuntimeEnvironment;
3333
import org.opengrok.indexer.history.Annotation;
34+
import org.opengrok.indexer.web.QueryParameters;
3435
import org.opengrok.indexer.web.Util;
3536

3637
/**
@@ -297,7 +298,7 @@ public void linkageMatched(LinkageMatchedEvent evt) {
297298
case FILELIKE:
298299
out.write("<a href=\"");
299300
out.write(urlPrefix);
300-
out.write("path=");
301+
out.write(QueryParameters.PATH_SEARCH_PARAM_EQ);
301302
/*
302303
* Maybe in the future the following should properly be
303304
* qurlencode(), but just htmlize() it for now.
@@ -309,13 +310,13 @@ public void linkageMatched(LinkageMatchedEvent evt) {
309310
out.write("</a>");
310311
break;
311312
case PATHLIKE:
312-
out.write(Util.breadcrumbPath(urlPrefix + "path=", str,
313-
'/'));
313+
out.write(Util.breadcrumbPath(urlPrefix +
314+
QueryParameters.PATH_SEARCH_PARAM_EQ, str, '/'));
314315
break;
315316
case QUERY:
316317
out.write("<a href=\"");
317318
out.write(urlPrefix);
318-
out.write("full=");
319+
out.write(QueryParameters.FULL_SEARCH_PARAM_EQ);
319320
Util.qurlencode(lstr, out);
320321
JFlexXrefUtils.appendProject(out, project);
321322
out.write("\">");
@@ -325,7 +326,7 @@ public void linkageMatched(LinkageMatchedEvent evt) {
325326
case REFS:
326327
out.write("<a href=\"");
327328
out.write(urlPrefix);
328-
out.write("refs=");
329+
out.write(QueryParameters.REFS_SEARCH_PARAM_EQ);
329330
Util.qurlencode(lstr, out);
330331
JFlexXrefUtils.appendProject(out, project);
331332
out.write("\">");
@@ -347,8 +348,9 @@ public void linkageMatched(LinkageMatchedEvent evt) {
347348
@Override
348349
public void pathlikeMatched(PathlikeMatchedEvent evt) {
349350
String str = evt.getStr();
350-
String breadcrumbPath = Util.breadcrumbPath(urlPrefix + "path=", str,
351-
evt.getSep(), getProjectPostfix(true), evt.getCanonicalize());
351+
String breadcrumbPath = Util.breadcrumbPath(urlPrefix +
352+
QueryParameters.PATH_SEARCH_PARAM_EQ, str, evt.getSep(),
353+
getProjectPostfix(true), evt.getCanonicalize());
352354
try {
353355
out.write(breadcrumbPath);
354356
} catch (IOException ex) {
@@ -406,7 +408,8 @@ protected void appendLink(String url)
406408

407409
protected String getProjectPostfix(boolean encoded) {
408410
String amp = encoded ? "&amp;" : "&";
409-
return project == null ? "" : (amp + "project=" + project.getName());
411+
return project == null ? "" : (amp + QueryParameters.PROJECT_SEARCH_PARAM_EQ +
412+
project.getName());
410413
}
411414

412415
protected void startScope() {

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/JFlexXrefUtils.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright 2011 Jens Elkner.
23-
* Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
23+
* Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
2424
*/
2525

2626
package org.opengrok.indexer.analysis;
@@ -43,6 +43,7 @@
4343
import org.opengrok.indexer.util.StringUtils;
4444
import org.opengrok.indexer.util.UriUtils;
4545
import org.opengrok.indexer.web.HtmlConsts;
46+
import org.opengrok.indexer.web.QueryParameters;
4647
import org.opengrok.indexer.web.Util;
4748

4849
/**
@@ -107,7 +108,8 @@ public static void appendLink(Writer out, JFlexLexer lexer, String url,
107108
public static void appendProject(Writer out, Project project)
108109
throws IOException {
109110
if (project != null) {
110-
out.write("&amp;project=");
111+
out.write("&amp;");
112+
out.write(QueryParameters.PROJECT_SEARCH_PARAM_EQ);
111113
out.write(project.getName());
112114
}
113115
}
@@ -267,7 +269,7 @@ public static boolean writeSymbol(Writer out, Definitions defs,
267269
// 2) Create a link that searches for all references to this symbol.
268270
out.append("<a href=\"");
269271
out.append(urlPrefix);
270-
out.append("refs=");
272+
out.append(QueryParameters.REFS_SEARCH_PARAM_EQ);
271273
Util.qurlencode(symbol, out);
272274
appendProject(out, project);
273275
out.append("\" class=\"");
@@ -286,7 +288,7 @@ public static boolean writeSymbol(Writer out, Definitions defs,
286288
// link to search for all definitions of that symbol instead.
287289
out.append("<a href=\"");
288290
out.append(urlPrefix);
289-
out.append("defs=");
291+
out.append(QueryParameters.DEFS_SEARCH_PARAM_EQ);
290292
Util.qurlencode(symbol, out);
291293
appendProject(out, project);
292294
out.append("\"");

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/BZip2Analyzer.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/*
2121
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
2323
*/
2424
package org.opengrok.indexer.analysis.archive;
2525

@@ -35,6 +35,7 @@
3535
import org.opengrok.indexer.analysis.AnalyzerGuru;
3636
import org.opengrok.indexer.analysis.FileAnalyzer;
3737
import org.opengrok.indexer.analysis.StreamSource;
38+
import org.opengrok.indexer.search.QueryBuilder;
3839

3940
/**
4041
* Analyzes a BZip2 file.
@@ -83,7 +84,7 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
8384
AbstractAnalyzer fa;
8485

8586
StreamSource bzSrc = wrap(src);
86-
String path = doc.get("path");
87+
String path = doc.get(QueryBuilder.PATH);
8788
if (path != null
8889
&& (path.endsWith(".bz2") || path.endsWith(".BZ2") || path.endsWith(".bz"))) {
8990
String newname = path.substring(0, path.lastIndexOf('.'));
@@ -98,10 +99,11 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
9899
this.g = Genre.DATA;
99100
}
100101
fa.analyze(doc, bzSrc, xrefOut);
101-
if (doc.get("t") != null) {
102-
doc.removeField("t");
102+
if (doc.get(QueryBuilder.T) != null) {
103+
doc.removeField(QueryBuilder.T);
103104
if (g == Genre.XREFABLE) {
104-
doc.add(new Field("t", g.typeName(), AnalyzerGuru.string_ft_stored_nanalyzed_norms));
105+
doc.add(new Field(QueryBuilder.T, g.typeName(),
106+
AnalyzerGuru.string_ft_stored_nanalyzed_norms));
105107
}
106108
}
107109
}

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/GZIPAnalyzer.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/*
2121
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
2323
*/
2424
package org.opengrok.indexer.analysis.archive;
2525

@@ -39,6 +39,7 @@
3939
import org.opengrok.indexer.analysis.FileAnalyzer;
4040
import org.opengrok.indexer.analysis.StreamSource;
4141
import org.opengrok.indexer.logger.LoggerFactory;
42+
import org.opengrok.indexer.search.QueryBuilder;
4243

4344
/**
4445
* Analyzes GZip files.
@@ -89,7 +90,7 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
8990
AbstractAnalyzer fa;
9091

9192
StreamSource gzSrc = wrap(src);
92-
String path = doc.get("path");
93+
String path = doc.get(QueryBuilder.PATH);
9394
if (path != null && path.toLowerCase(Locale.ROOT).endsWith(".gz")) {
9495
String newname = path.substring(0, path.length() - 3);
9596
//System.err.println("GZIPPED OF = " + newname);
@@ -108,10 +109,11 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
108109
this.g = Genre.DATA;
109110
}
110111
fa.analyze(doc, gzSrc, xrefOut);
111-
if (doc.get("t") != null) {
112-
doc.removeField("t");
112+
if (doc.get(QueryBuilder.T) != null) {
113+
doc.removeField(QueryBuilder.T);
113114
if (g == Genre.XREFABLE) {
114-
doc.add(new Field("t", g.typeName(), AnalyzerGuru.string_ft_stored_nanalyzed_norms));
115+
doc.add(new Field(QueryBuilder.T, g.typeName(),
116+
AnalyzerGuru.string_ft_stored_nanalyzed_norms));
115117
}
116118
}
117119

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/executables/JavaClassAnalyzer.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/*
2121
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
22-
* Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
22+
* Portions Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
2323
* Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
2424
*/
2525
package org.opengrok.indexer.analysis.executables;
@@ -64,6 +64,7 @@
6464
import org.opengrok.indexer.configuration.RuntimeEnvironment;
6565
import org.opengrok.indexer.logger.LoggerFactory;
6666
import org.opengrok.indexer.search.QueryBuilder;
67+
import org.opengrok.indexer.web.QueryParameters;
6768
import org.opengrok.indexer.web.Util;
6869

6970
/**
@@ -166,21 +167,19 @@ void analyze(Document doc, InputStream in, Writer xrefOut,
166167
private static final String AHREF = "<a href=\"";
167168
private static final String AHREFT_END = "\">";
168169
private static final String AHREFEND = "</a>";
169-
private static final String ADEFS = "defs=";
170-
private static final String APATH = "path=";
171170
private static final String AIHREF = "\" href=\"";
172171
private static final String ADHREF = "<a class=\"d\" name=\"";
173172
private final StringBuffer rstring = new StringBuffer(512);
174173
protected String linkPath(String path) {
175174
rstring.setLength(0);
176-
return rstring.append(AHREF).append(urlPrefix).append(APATH)
175+
return rstring.append(AHREF).append(urlPrefix).append(QueryParameters.PATH_SEARCH_PARAM_EQ)
177176
.append(Util.URIEncodePath(path)).append(AHREFT_END)
178177
.append(Util.htmlize(path)).append(AHREFEND).toString();
179178
}
180179

181180
protected String linkDef(String def) {
182181
rstring.setLength(0);
183-
return rstring.append(AHREF).append(urlPrefix).append(ADEFS)
182+
return rstring.append(AHREF).append(urlPrefix).append(QueryParameters.DEFS_SEARCH_PARAM_EQ)
184183
.append(Util.URIEncode(def)).append(AHREFT_END)
185184
.append(Util.htmlize(def)).append(AHREFEND).toString();
186185
}
@@ -195,7 +194,7 @@ protected String tagDef(String def) {
195194

196195
rstring.setLength(0);
197196
return rstring.append(ADHREF).append(Util.formQuoteEscape(name))
198-
.append(AIHREF).append(urlPrefix).append(ADEFS)
197+
.append(AIHREF).append(urlPrefix).append(QueryParameters.DEFS_SEARCH_PARAM_EQ)
199198
.append(Util.URIEncode(def)).append(AHREFT_END)
200199
.append(Util.htmlize(def)).append(AHREFEND).toString();
201200
}

0 commit comments

Comments
 (0)