Merge pull request #464 from rdulmina/master

Fix the build after snakeyaml upgrade to 2.0
wso2 · Jul 27, 2023 · 35dcde4 · 35dcde4
2 parents 64564ee + 08213f3
commit 35dcde4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...tty/src/main/java/org/wso2/transport/http/netty/contract/config/ConfigurationBuilder.java b/...tty/src/main/java/org/wso2/transport/http/netty/contract/config/ConfigurationBuilder.java
@@ -17,6 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
 import org.yaml.snakeyaml.introspector.BeanAccess;
@@ -80,7 +81,8 @@ public TransportsConfiguration getConfiguration(String configFileLocation) {
  if (file.exists()) {
  try (Reader in = new InputStreamReader(new FileInputStream(file), StandardCharsets.ISO_8859_1)) {
  Yaml yaml = new Yaml(new CustomClassLoaderConstructor
- (TransportsConfiguration.class, TransportsConfiguration.class.getClassLoader()));
+ (TransportsConfiguration.class, TransportsConfiguration.class.getClassLoader(),
+ new LoaderOptions()));
  yaml.setBeanAccess(BeanAccess.FIELD);
  transportsConfiguration = yaml.loadAs(in, TransportsConfiguration.class);
  } catch (IOException e) {

diff --git a/....wso2.transport.http.netty/src/test/java/org/wso2/transport/http/netty/util/TestUtil.java b/....wso2.transport.http.netty/src/test/java/org/wso2/transport/http/netty/util/TestUtil.java
@@ -43,6 +43,7 @@
 import org.wso2.transport.http.netty.util.server.HttpServer;
 import org.wso2.transport.http.netty.util.server.HttpsServer;
 import org.wso2.transport.http.netty.util.server.ServerThread;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
 import org.yaml.snakeyaml.introspector.BeanAccess;
@@ -221,7 +222,7 @@ public static TransportsConfiguration getConfiguration(String configFileLocation
  try (Reader in = new InputStreamReader(new FileInputStream(file), StandardCharsets.ISO_8859_1)) {
  Yaml yaml = new Yaml(new CustomClassLoaderConstructor
  (TransportsConfiguration.class,
- TransportsConfiguration.class.getClassLoader()));
+ TransportsConfiguration.class.getClassLoader(), new LoaderOptions()));
  yaml.setBeanAccess(BeanAccess.FIELD);
  transportsConfiguration = yaml.loadAs(in, TransportsConfiguration.class);
  } catch (IOException e) {

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.wso2</groupId>
  <artifactId>wso2</artifactId>
- <version>5</version>
+ <version>5.1</version>
  </parent>
  <packaging>pom</packaging>
  <groupId>org.wso2.transport.http</groupId>