STRLCPY/wrongsecrets

Merge pull request #528 from nhumblot/525-replace-deprecated-asciidoctor-and-options-builder-methods
```
#525 Replace Asciidoctor::convert() and OptionsBuilder::options() dep…
```
Jeroen Willemsen committed with GitHub 2 years ago

fc7e4ec3

2 parents
7d23ca62
dfdef65c

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

src/main/java/org/owasp/wrongsecrets/asciidoc/AsciiDocGenerator.java

1	1		package org.owasp.wrongsecrets.asciidoc;
2	2
3	3		import org.asciidoctor.Asciidoctor;
	4	+	import org.asciidoctor.Options;
4	5		import org.springframework.core.io.ClassPathResource;
5	6
6	7		import java.io.IOException;
7	8		import java.io.InputStreamReader;
8	9		import java.io.StringWriter;
9		-	import java.util.Map;
10	10
11	11		import static org.asciidoctor.Asciidoctor.Factory.create;
12	12
		skipped 6 lines
19	19		var templateFile = name + ".adoc";
20	20		try (var is = new ClassPathResource(templateFile).getInputStream()) {
21	21		var writer = new StringWriter();
22		-	asciidoctor.convert(new InputStreamReader(is), writer, Map.of());
	22	+	asciidoctor.convert(new InputStreamReader(is), writer, Options.builder().build());
23	23		return writer.toString();
24	24		}
25	25		}
		skipped 2 lines

■ ■ ■ ■ ■ ■

src/main/java/org/owasp/wrongsecrets/challenges/ChallengesAPIController.java

		skipped 3 lines
4	4		import com.nimbusds.jose.shaded.json.JSONObject;
5	5		import lombok.extern.slf4j.Slf4j;
6	6		import org.asciidoctor.Asciidoctor;
7		-	import org.asciidoctor.OptionsBuilder;
	7	+	import org.asciidoctor.Options;
8	8		import org.owasp.wrongsecrets.RuntimeEnvironment;
9	9		import org.owasp.wrongsecrets.ScoreCard;
10	10		import org.owasp.wrongsecrets.asciidoc.TemplateGenerator;
		skipped 79 lines
90	90		descriptions.add(description);
91	91		} catch (IOException e) {
92	92		String rawHint = extractResource("classpath:explanations/" + challengeUI.getExplanation() + "_hint.adoc");
93		-	String hint = Asciidoctor.Factory.create().convert(rawHint, OptionsBuilder.options().build());
	93	+	String hint = Asciidoctor.Factory.create().convert(rawHint, Options.builder().build());
94	94		hints.add(hint);
95	95		String rawDescription = extractResource("classpath:explanations/" + challengeUI.getExplanation() + ".adoc");
96		-	String description = Asciidoctor.Factory.create().convert(rawDescription, OptionsBuilder.options().build());
	96	+	String description = Asciidoctor.Factory.create().convert(rawDescription, Options.builder().build());
97	97		descriptions.add(description);
98	98		throw new RuntimeException(e);
99	99		}
		skipped 26 lines