Skip to content

Commit a5942fe

Browse files
committed
Revert "try and fix resource path on windows"
This reverts commit c9ba9a9.
1 parent c9ba9a9 commit a5942fe

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/opentelemetry/ConfigWrapper.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import static java.util.Collections.emptyList;
99

1010
import java.io.IOException;
11-
import java.io.InputStream;
12-
import java.net.URL;
11+
import java.nio.charset.Charset;
12+
import java.nio.file.Files;
13+
import java.nio.file.Paths;
1314
import java.time.Duration;
1415
import java.util.Collections;
1516
import java.util.List;
@@ -36,15 +37,10 @@ private ConfigWrapper(Map<String, ?> config) {
3637
}
3738

3839
public static ConfigWrapper parse(String configFile) throws IOException {
39-
return parse(new URL("file://" + configFile));
40-
}
41-
42-
public static ConfigWrapper parse(URL configFile) throws IOException {
4340
Yaml yaml = new Yaml();
44-
try (InputStream in = configFile.openStream()) {
45-
Map<String, ?> config = yaml.load(in);
46-
return new ConfigWrapper(config);
47-
}
41+
Map<String, ?> config =
42+
yaml.load(Files.newBufferedReader(Paths.get(configFile), Charset.defaultCharset()));
43+
return new ConfigWrapper(config);
4844
}
4945

5046
public int getNumberOfThreads() {

ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/opentelemetry/ConfigWrapperTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,41 @@
88
import static java.util.Collections.singletonList;
99
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
1010

11-
import java.net.URL;
1211
import java.time.Duration;
1312
import java.time.temporal.ChronoUnit;
1413
import org.junit.jupiter.api.BeforeEach;
1514
import org.junit.jupiter.api.Test;
1615

1716
class ConfigWrapperTest {
1817

19-
URL configFile;
18+
String file;
2019

2120
@BeforeEach
2221
void setUp() {
23-
configFile = ConfigWrapperTest.class.getResource("/conf/config.yml");
22+
file = ConfigWrapperTest.class.getResource("/conf/config.yml").getFile();
2423
}
2524

2625
@Test
2726
void testQueueManagerNames() throws Exception {
28-
ConfigWrapper config = ConfigWrapper.parse(configFile);
27+
ConfigWrapper config = ConfigWrapper.parse(file);
2928
assertThat(config.getQueueManagerNames()).isEqualTo(singletonList("QM1"));
3029
}
3130

3231
@Test
3332
void testNumberOfThreads() throws Exception {
34-
ConfigWrapper config = ConfigWrapper.parse(configFile);
33+
ConfigWrapper config = ConfigWrapper.parse(file);
3534
assertThat(config.getNumberOfThreads()).isEqualTo(20);
3635
}
3736

3837
@Test
3938
void testTaskDelay() throws Exception {
40-
ConfigWrapper config = ConfigWrapper.parse(configFile);
39+
ConfigWrapper config = ConfigWrapper.parse(file);
4140
assertThat(config.getTaskDelay()).isEqualTo(Duration.of(27, ChronoUnit.SECONDS));
4241
}
4342

4443
@Test
4544
void testTaskInitialDelay() throws Exception {
46-
ConfigWrapper config = ConfigWrapper.parse(configFile);
45+
ConfigWrapper config = ConfigWrapper.parse(file);
4746
assertThat(config.getTaskInitialDelaySeconds()).isEqualTo(0);
4847
}
4948
}

0 commit comments

Comments
 (0)