Skip to content

Commit a1e779d

Browse files
1ambda1ambda
committed
style: Use zeppelin checkstyle.xml
1 parent 13e0dc4 commit a1e779d

File tree

8 files changed

+235
-221
lines changed

8 files changed

+235
-221
lines changed

‎markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,17 @@
3333
import org.slf4j.Logger;
3434
import org.slf4j.LoggerFactory;
3535

36-
/** MarkdownInterpreter interpreter for Zeppelin. */
36+
/**
37+
* MarkdownInterpreter interpreter for Zeppelin.
38+
*/
3739
public class Markdown extends Interpreter {
3840
private static final Logger LOGGER = LoggerFactory.getLogger(Markdown.class);
3941

4042
private MarkdownParser parser;
4143

42-
/** Markdown Parser Type. */
44+
/**
45+
* Markdown Parser Type.
46+
*/
4347
public enum MarkdownParserType {
4448
PEGDOWN {
4549
@Override
@@ -82,7 +86,8 @@ public void open() {
8286
}
8387

8488
@Override
85-
public void close() {}
89+
public void close() {
90+
}
8691

8792
@Override
8893
public InterpreterResult interpret(String markdownText, InterpreterContext interpreterContext) {
@@ -99,7 +104,8 @@ public InterpreterResult interpret(String markdownText, InterpreterContext inter
99104
}
100105

101106
@Override
102-
public void cancel(InterpreterContext context) {}
107+
public void cancel(InterpreterContext context) {
108+
}
103109

104110
@Override
105111
public FormType getFormType() {

‎markdown/src/main/java/org/apache/zeppelin/markdown/Markdown4jParser.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323

2424
import java.io.IOException;
2525

26-
/** Markdown Parser using markdown4j processor . */
26+
/**
27+
* Markdown Parser using markdown4j processor.
28+
*/
2729
public class Markdown4jParser implements MarkdownParser {
2830
private Markdown4jProcessor processor;
2931

‎markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownParser.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
package org.apache.zeppelin.markdown;
1919

20-
/** Abstract Markdown Parser. */
20+
/**
21+
* Abstract Markdown Parser.
22+
*/
2123
public interface MarkdownParser {
2224
String render(String markdownText);
2325
}

‎markdown/src/main/java/org/apache/zeppelin/markdown/ParamVar.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
import java.util.Map;
2424

2525
/**
26-
* Implementation of Var to support parameter parsing
26+
* Implementation of Var to support parameter parsing.
27+
*
28+
* @param <K> Key
29+
* @param <V> Value
2730
*/
2831
public class ParamVar<K, V> extends Var<Map<K, V>> {
2932

‎markdown/src/main/java/org/apache/zeppelin/markdown/PegdownParser.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public class PegdownParser implements MarkdownParser {
3232

3333
public PegdownParser() {
3434
PegDownPlugins plugins = new PegDownPlugins.Builder()
35-
.withPlugin(PegdownYumlPlugin.class)
36-
.withPlugin(PegdownWebSequencelPlugin.class)
37-
.build();
35+
.withPlugin(PegdownYumlPlugin.class)
36+
.withPlugin(PegdownWebSequencelPlugin.class)
37+
.build();
3838
processor = new PegDownProcessor(OPTIONS, PARSING_TIMEOUT_AS_MILLIS, plugins);
3939
}
4040

@@ -56,9 +56,9 @@ public String render(String markdownText) {
5656
*/
5757
public static String wrapWithMarkdownClassDiv(String html) {
5858
return new StringBuilder()
59-
.append("<div class=\"markdown-body\">\n")
60-
.append(html)
61-
.append("\n</div>")
62-
.toString();
59+
.append("<div class=\"markdown-body\">\n")
60+
.append(html)
61+
.append("\n</div>")
62+
.toString();
6363
}
6464
}

‎markdown/src/main/java/org/apache/zeppelin/markdown/PegdownWebSequencelPlugin.java‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,13 @@ public class PegdownWebSequencelPlugin extends Parser implements BlockPluginPars
4646

4747
public PegdownWebSequencelPlugin() {
4848
super(PegdownParser.OPTIONS,
49-
PegdownParser.PARSING_TIMEOUT_AS_MILLIS,
50-
DefaultParseRunnerProvider);
49+
PegdownParser.PARSING_TIMEOUT_AS_MILLIS,
50+
DefaultParseRunnerProvider);
5151
}
5252

53-
public PegdownWebSequencelPlugin(Integer options,
54-
Long maxParsingTimeInMillis,
55-
ParseRunnerProvider parseRunnerProvider,
53+
public PegdownWebSequencelPlugin(Integer opts, Long millis, ParseRunnerProvider provider,
5654
PegDownPlugins plugins) {
57-
super(options, maxParsingTimeInMillis, parseRunnerProvider, plugins);
55+
super(opts, millis, provider, plugins);
5856
}
5957

6058
public static final String TAG = "%%%";
@@ -76,17 +74,16 @@ Rule BlockRule() {
7674
StringBuilderVar body = new StringBuilderVar();
7775

7876
return NodeSequence(
79-
StartMarker(),
80-
Optional(
81-
String("style="),
82-
Sequence(OneOrMore(Letter()), style.append(match()), Spn1())),
83-
Sequence(Body(), body.append(match())),
84-
EndMarker(),
85-
push(
86-
new ExpImageNode("title",
87-
createWebsequenceUrl(style.getString(), body.getString()),
88-
new TextNode(""))
89-
)
77+
StartMarker(),
78+
Optional(
79+
String("style="),
80+
Sequence(OneOrMore(Letter()), style.append(match()), Spn1())),
81+
Sequence(Body(), body.append(match())),
82+
EndMarker(),
83+
push(
84+
new ExpImageNode("title",
85+
createWebsequenceUrl(style.getString(), body.getString()),
86+
new TextNode("")))
9087
);
9188
}
9289

@@ -102,12 +99,12 @@ public static String createWebsequenceUrl(String style,
10299

103100
try {
104101
String query = new StringBuilder()
105-
.append("style=")
106-
.append(style)
107-
.append("&message=")
108-
.append(URLEncoder.encode(content, "UTF-8"))
109-
.append("&apiVersion=1")
110-
.toString();
102+
.append("style=")
103+
.append(style)
104+
.append("&message=")
105+
.append(URLEncoder.encode(content, "UTF-8"))
106+
.append("&apiVersion=1")
107+
.toString();
111108

112109
URL url = new URL(WEBSEQ_URL);
113110
URLConnection conn = url.openConnection();
@@ -117,7 +114,8 @@ public static String createWebsequenceUrl(String style,
117114
writer.flush();
118115

119116
StringBuilder response = new StringBuilder();
120-
reader = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
117+
reader = new BufferedReader(
118+
new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
121119
String line;
122120
while ((line = reader.readLine()) != null) {
123121
response.append(line);

‎markdown/src/main/java/org/apache/zeppelin/markdown/PegdownYumlPlugin.java‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class PegdownYumlPlugin extends Parser implements BlockPluginParser {
3939

4040
public PegdownYumlPlugin() {
4141
super(PegdownParser.OPTIONS,
42-
PegdownParser.PARSING_TIMEOUT_AS_MILLIS,
43-
DefaultParseRunnerProvider);
42+
PegdownParser.PARSING_TIMEOUT_AS_MILLIS,
43+
DefaultParseRunnerProvider);
4444
}
4545

4646
public PegdownYumlPlugin(Integer options,
@@ -75,20 +75,21 @@ Rule BlockRule() {
7575
StringBuilderVar body = new StringBuilderVar();
7676

7777
return NodeSequence(
78-
StartMarker(),
79-
ZeroOrMore(
80-
Sequence(
81-
ParameterName(), name.append(match()),
82-
String("="),
83-
OneOrMore(Alphanumeric()), value.append(match())
84-
),
85-
Sp(),
86-
params.put(name.getString(), value.getString()),
87-
name.clear(), value.clear()
88-
)
89-
, Body(), body.append(match())
90-
, EndMarker()
91-
, push(new ExpImageNode("title", createYumlUrl(params.get(), body.getString()), new TextNode("")))
78+
StartMarker(),
79+
ZeroOrMore(
80+
Sequence(
81+
ParameterName(), name.append(match()),
82+
String("="),
83+
OneOrMore(Alphanumeric()), value.append(match())),
84+
Sp(),
85+
params.put(name.getString(), value.getString()),
86+
name.clear(), value.clear()),
87+
Body(),
88+
body.append(match()),
89+
EndMarker(),
90+
push(
91+
new ExpImageNode(
92+
"title", createYumlUrl(params.get(), body.getString()), new TextNode("")))
9293
);
9394
}
9495

@@ -118,19 +119,21 @@ public static String createYumlUrl(Map<String, String> params, String body) {
118119

119120
mergedStyle.append(style);
120121

121-
if (null != params.get("dir"))
122+
if (null != params.get("dir")) {
122123
mergedStyle.append(";dir:" + params.get("dir"));
124+
}
123125

124-
if (null != params.get("scale"))
126+
if (null != params.get("scale")) {
125127
mergedStyle.append(";scale:" + params.get("scale"));
128+
}
126129

127130
return new StringBuilder()
128-
.append("http://yuml.me/diagram/")
129-
.append(mergedStyle.toString() + "/")
130-
.append(type + "/")
131-
.append(encodedBody)
132-
.append("." + format)
133-
.toString();
131+
.append("http://yuml.me/diagram/")
132+
.append(mergedStyle.toString() + "/")
133+
.append(type + "/")
134+
.append(encodedBody)
135+
.append("." + format)
136+
.toString();
134137
}
135138

136139
@Override

0 commit comments

Comments
 (0)