Skip to content

Increase YAML Codepoint max #6

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
jascotty2 wants to merge 3 commits into
base: standalone-impl
Choose a base branch
from
Open

Increase YAML Codepoint max #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6210a64
fix API pom parent version
jascotty2 Oct 3, 2022
bfbf0ed
fix shade-plugin version
jascotty2 Oct 3, 2022
a217522
increase SnakeYAML codepoint size
jascotty2 Oct 3, 2022
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
6 changes: 3 additions & 3 deletions API/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>ConfigurationMaster</artifactId>
<groupId>com.github.thatsmusic99</groupId>
<version>v2.0.0-BETA-2</version>
<version>v2.0.0-BETA-3</version>
Copy link
Collaborator

@Thatsmusic99 Thatsmusic99 Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same applies here

</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>ConfigurationMaster-API</artifactId>
<version>v2.0.0-BETA-3</version>
<version>v2.0.0-BETA-4</version>

<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.30</version>
<version>1.33</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 3 additions & 1 deletion API/src/main/java/io/github/thatsmusic99/configurationmaster/api/ConfigFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class ConfigFile extends CMConfigSection {

private final Yaml yaml;
private final DumperOptions yamlOptions = new DumperOptions();
private final LoaderOptions yamlLoaderOptions = new LoaderOptions();
private final Representer yamlRepresenter = new Representer();
private final File file;
private boolean isNew = false;
Expand All @@ -62,10 +63,11 @@ public class ConfigFile extends CMConfigSection {
* @throws YAMLException if the file being loaded contains syntax errors.
*/
public ConfigFile(@NotNull File file) throws IOException {
yaml = new Yaml(new SafeConstructor(), yamlRepresenter, yamlOptions);
yaml = new Yaml(new SafeConstructor(), yamlRepresenter, yamlOptions, yamlLoaderOptions);
yamlOptions.setIndent(2);
yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
yamlLoaderOptions.setCodePointLimit(64 * 1024 * 1024); // 64 MB
this.file = file;
writer = new CommentWriter(this);
pendingComments = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions Bukkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>com.github.thatsmusic99</groupId>
<artifactId>ConfigurationMaster-API</artifactId>
<version>v2.0.0-BETA-2</version>
<version>v2.0.0-BETA-3</version>
Copy link
Collaborator

@Thatsmusic99 Thatsmusic99 Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The beta version specified was BETA-4 rather than 3, if it was 2 that's an error on my end

</dependency>
<!-- Spigot Dependency -->
<dependency>
Expand Down