Skip to content

Commit dfc9e4e

Browse files
Christoffer-Cortesvasile-baluta
authored andcommitted
Implemented a new way to get templates with direct path (#62)
implement new way to get templates with direct path and add lowercase template file names.
1 parent a6eabea commit dfc9e4e

34 files changed

+26
-23
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ build
55
.classpath
66
.project
77
.settings/
8+
/.gradle/

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 0.3.5
2+
- Changed the way template files are read and parsed in getEventTemplate method.
3+
14
## 0.3.4
25
- Implemented method to get template from specified event type.
36

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ allprojects {
4848

4949
jar {
5050
baseName = 'eiffel-remrem-semantics'
51-
version = '0.3.4'
51+
version = '0.3.5'
5252
manifest {
5353
attributes('remremVersionKey': 'semanticsVersion')
5454
attributes('semanticsVersion': version)
@@ -66,7 +66,7 @@ jar {
6666

6767
shadowJar {
6868
baseName = 'eiffel-remrem-semantics'
69-
version = '0.3.4'
69+
version = '0.3.5'
7070
classifier = ''
7171
}
7272

src/main/java/com/ericsson/eiffel/remrem/semantics/SemanticsService.java

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@
4545
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ISSUE_VERIFIED;
4646
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_REUSED;
4747

48-
import java.io.File;
49-
import java.io.FileReader;
50-
import java.net.URL;
48+
import java.io.InputStream;
49+
import java.io.InputStreamReader;
5150
import java.util.ArrayList;
5251
import java.util.Collection;
5352
import java.util.HashMap;
54-
import java.util.List;
5553
import java.util.Map;
5654

5755
import javax.annotation.PostConstruct;
@@ -295,26 +293,27 @@ public Collection<String> getSupportedEventTypes() {
295293
return supportedEventTypes;
296294
}
297295

296+
/**
297+
* Gets the path to an event template file that must be in lowercase
298+
* and read through a resource stream. Stream is parsed into a
299+
* JsonElement.
300+
*
301+
* @param String eventType
302+
*
303+
* @return json element containing an event template
304+
*/
298305
@Override
299-
public JsonElement getEventTemplate(String eventType) {
300-
String fileName = eventType+".json";
301-
File file = null;
302-
File folder = null;
303-
URL url = getClass().getClassLoader().getResource("templates");
304-
folder = new File(url.getPath());
305-
for(File fl : folder.listFiles()) {
306-
if(fl.getName().equalsIgnoreCase(fileName)) {
307-
file = fl;
308-
}
309-
}
306+
public JsonElement getEventTemplate(String eventType) {
307+
String path = "templates/"+eventType.toLowerCase()+".json";
308+
InputStream fileStream = getClass().getClassLoader().getResourceAsStream(path);
310309
JsonElement json = null;
311310
JsonParser parser = new JsonParser();
312-
if(file != null)
313-
try {
314-
json = parser.parse(new FileReader(file));
315-
} catch (Exception e) {
316-
e.printStackTrace();
317-
}
311+
try {
312+
json = parser.parse(new InputStreamReader(fileStream));
313+
} catch (Exception e) {
314+
e.printStackTrace();
315+
}
316+
318317
return json;
319318
}
320319

0 commit comments

Comments
 (0)