Skip to content

Commit d884380

Browse files
xdurvakxdurvak
authored
Generated eiffel events using toulouse edition of schemas (#71)
1 parent e016cd3 commit d884380

File tree

270 files changed

+19934
-18749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+19934
-18749
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## 0.3.9
22
- Generated event epoch time is in UTC format only
33

4+
- Generated eiffel events using Toulouse edition of eiffel and operations-extension schemas
5+
46
## 0.3.8
57
- added logback dependency
68

‎build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ dependencies {
106106
compile 'javax.inject:javax.inject:1'
107107
compile 'org.slf4j:slf4j-api:1.7.18'
108108
compile 'ch.qos.logback:logback-classic:1.1.7'
109-
compile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
109+
compile group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
110110
testCompile 'junit:junit:4.12'
111111
compile 'org.apache.commons:commons-lang3:3.5'
112112
compile 'javax.validation:validation-api:1.1.0.CR2'
@@ -130,17 +130,17 @@ task runJava(type:JavaExec){
130130

131131
def eiffelRepoURL = 'https://github.com/Ericsson/eiffel.git'
132132

133-
//specific branch name to clone
133+
//specific branch name to clone or if it is a tag it should be like 'tags/name of the tag' ex: 'tags/xxxxxx'
134134

135-
def eiffelRepoBranch = 'master'
135+
def eiffelRepoBranch = 'tags/edition-toulouse'
136136

137137
// Remote Continuous Operations repository URL
138138

139139
def eiffelOperationsExtensionRepoUrl = 'https://github.com/Ericsson/eiffel-operations-extension.git'
140140

141-
//branch name to perform clone
141+
//branch name to perform clone or if it is a tag it should be like 'tags/name of the tag' ex: 'tags/xxxxxx'
142142

143-
def operationsRepoBranch = 'master'
143+
def operationsRepoBranch = 'tags/Toulouse'
144144

145145
main 'com.ericsson.eiffel.remrem.semantics.clone.PrepareLocalEiffelSchemas'
146146
classpath sourceSets.main.runtimeClasspath

‎src/main/java/com/ericsson/eiffel/remrem/semantics/EiffelEventType.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public enum EiffelEventType {
4747
SERVICE_DEPLOYED("EiffelServiceDeployedEvent"),
4848
SERVICE_ALLOCATED("EiffelServiceAllocatedEvent"),
4949
ARTIFACT_DEPLOYED("EiffelArtifactDeployedEvent"),
50-
ANNOUNCEMENT_ACKNOWLEDGED("EiffelAnnouncementAcknowledgedEvent");
50+
ALERT_ACKNOWLEDGED("EiffelAlertAcknowledgedEvent"),
51+
ALERT_CEASED("EiffelAlertCeasedEvent"),
52+
ALERT_RAISED("EiffelAlertRaisedEvent");
5153

5254
private String eventType;
5355

‎src/main/java/com/ericsson/eiffel/remrem/semantics/LinkType.java

+65-61
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,65 @@
1-
/*
2-
Copyright 2018 Ericsson AB.
3-
For a full list of individual contributors, please see the commit history.
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
14-
*/
15-
package com.ericsson.eiffel.remrem.semantics;
16-
17-
import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;
18-
19-
/**
20-
* This class contains list of link types and multiple tracability for those link types.
21-
*
22-
*/
23-
public enum LinkType {
24-
25-
CAUSE(EiffelConstants.MULTIPLE_ALLOWED),
26-
CONTEXT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
27-
FLOW_CONTEXT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
28-
ACTIVITY_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
29-
PREVIOUS_ACTIVITY_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
30-
PREVIOUS_VERSION(EiffelConstants.MULTIPLE_ALLOWED),
31-
COMPOSITION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
32-
ENVIRONMENT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
33-
ARTIFACT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
34-
SUBJECT(EiffelConstants.MULTIPLE_ALLOWED),
35-
ELEMENT(EiffelConstants.MULTIPLE_ALLOWED),
36-
BASE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
37-
CHANGE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
38-
TEST_SUITE_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
39-
TEST_CASE_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
40-
IUT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
41-
TERC(EiffelConstants.MULTIPLE_NOT_ALLOWED),
42-
MODIFIED_ANNOUNCEMENT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
43-
SUB_CONFIDENCE_LEVEL(EiffelConstants.MULTIPLE_ALLOWED),
44-
REUSED_ARTIFACT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
45-
VERIFICATION_BASIS(EiffelConstants.MULTIPLE_ALLOWED);
46-
47-
private final boolean multipleAllowed;
48-
49-
LinkType(boolean multipleAllowed) {
50-
this.multipleAllowed = multipleAllowed;
51-
}
52-
53-
/**
54-
* This method checks multiple traces allowed for a link type
55-
* @return true if multiple traces allowed for the link type
56-
* false if multiple traces not allowed for the link type
57-
*/
58-
public boolean isMultipleAllowed() {
59-
return multipleAllowed;
60-
}
61-
}
1+
/*
2+
Copyright 2018 Ericsson AB.
3+
For a full list of individual contributors, please see the commit history.
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
*/
15+
package com.ericsson.eiffel.remrem.semantics;
16+
17+
import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;
18+
19+
/**
20+
* This class contains list of link types and multiple tracability for those link types.
21+
*
22+
*/
23+
public enum LinkType {
24+
25+
CAUSE(EiffelConstants.MULTIPLE_ALLOWED),
26+
CONTEXT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
27+
FLOW_CONTEXT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
28+
ACTIVITY_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
29+
PREVIOUS_ACTIVITY_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
30+
PREVIOUS_VERSION(EiffelConstants.MULTIPLE_ALLOWED),
31+
COMPOSITION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
32+
ENVIRONMENT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
33+
ARTIFACT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
34+
SUBJECT(EiffelConstants.MULTIPLE_ALLOWED),
35+
ELEMENT(EiffelConstants.MULTIPLE_ALLOWED),
36+
BASE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
37+
CHANGE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
38+
TEST_SUITE_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
39+
TEST_CASE_EXECUTION(EiffelConstants.MULTIPLE_NOT_ALLOWED),
40+
IUT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
41+
TERC(EiffelConstants.MULTIPLE_NOT_ALLOWED),
42+
MODIFIED_ANNOUNCEMENT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
43+
SUB_CONFIDENCE_LEVEL(EiffelConstants.MULTIPLE_ALLOWED),
44+
REUSED_ARTIFACT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
45+
VERIFICATION_BASIS(EiffelConstants.MULTIPLE_ALLOWED),
46+
ALERT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
47+
MODIFIED_ALERT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
48+
ARTIFACT_DEPLOYED(EiffelConstants.MULTIPLE_ALLOWED),
49+
SERVICE(EiffelConstants.MULTIPLE_NOT_ALLOWED);
50+
51+
private final boolean multipleAllowed;
52+
53+
LinkType(boolean multipleAllowed) {
54+
this.multipleAllowed = multipleAllowed;
55+
}
56+
57+
/**
58+
* This method checks multiple traces allowed for a link type
59+
* @return true if multiple traces allowed for the link type
60+
* false if multiple traces not allowed for the link type
61+
*/
62+
public boolean isMultipleAllowed() {
63+
return multipleAllowed;
64+
}
65+
}

‎src/main/java/com/ericsson/eiffel/remrem/semantics/RoutingKeyTypes.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ public enum RoutingKeyTypes {
4040
EiffelTestSuiteFinishedEvent(EiffelConstants.TEST,"suitefinished"),
4141
EiffelTestSuiteStartedEvent(EiffelConstants.TEST,"suitestarted"),
4242
EiffelTestExecutionRecipeCollectionCreatedEvent(EiffelConstants.TEST,"execution"),
43-
EiffelAnnouncementAcknowledgedEvent(EiffelConstants.INFO,"announcementack"),
43+
EiffelAlertAcknowledgedEvent(EiffelConstants.ALERT,"alertack"),
4444
EiffelArtifactDeployedEvent(EiffelConstants.ARTIFACT,"deployed"),
4545
EiffelServiceAllocatedEvent(EiffelConstants.SERVICE,"allocated"),
4646
EiffelServiceDeployedEvent(EiffelConstants.SERVICE,"deployed"),
4747
EiffelServiceDiscontinuedEvent(EiffelConstants.SERVICE,"discontinued"),
4848
EiffelServiceReturnedEvent(EiffelConstants.SERVICE,"returned"),
4949
EiffelServiceStartedEvent(EiffelConstants.SERVICE,"started"),
50-
EiffelServiceStoppedEvent(EiffelConstants.SERVICE,"stopped");
50+
EiffelServiceStoppedEvent(EiffelConstants.SERVICE,"stopped"),
51+
EiffelAlertRaisedEvent(EiffelConstants.ALERT,"raised"),
52+
EiffelAlertCeasedEvent(EiffelConstants.ALERT,"ceased");
5153

5254

5355
private final String family; // family

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

+46-67
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,7 @@
1414
*/
1515
package com.ericsson.eiffel.remrem.semantics;
1616

17-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ACTIVITY_CANCELED;
18-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ACTIVITY_FINISHED;
19-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ACTIVITY_STARTED;
20-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ACTIVITY_TRIGGERED;
21-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ANNOUNCEMENT_PUBLISHED;
22-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_CREATED;
23-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_PUBLISHED;
24-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.COMPOSITION_DEFINED;
25-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.CONFIDENCELEVEL_MODIFIED;
26-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_CANCELED;
27-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_TRIGGERED;
28-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.EXECUTION_RECIPE_COLLECTION_CREATED;
29-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ENVIRONMENT_DEFINED;
30-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.FLOWCONTEXT_DEFINED;
31-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_ALLOCATED;
32-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_DEPLOYED;
33-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_DISCONTINUED;
34-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_RETURNED;
35-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_STARTED;
36-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_STOPPED;
37-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ANNOUNCEMENT_ACKNOWLEDGED;
38-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_DEPLOYED;
39-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SOURCECHANGE_CREATED;
40-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SOURCECHANGE_SUBMITTED;
41-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_FINISHED;
42-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_STARTED;
43-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTSUITE_FINISHED;
44-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTSUITE_STARTED;
45-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ISSUE_VERIFIED;
46-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_REUSED;
17+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.*;
4718

4819
import java.io.InputStream;
4920
import java.io.InputStreamReader;
@@ -69,18 +40,19 @@
6940
import com.ericsson.eiffel.semantics.events.EiffelActivityFinishedEvent;
7041
import com.ericsson.eiffel.semantics.events.EiffelActivityStartedEvent;
7142
import com.ericsson.eiffel.semantics.events.EiffelActivityTriggeredEvent;
72-
import com.ericsson.eiffel.semantics.events.EiffelAnnouncementAcknowledgedEvent;
43+
import com.ericsson.eiffel.semantics.events.EiffelAlertAcknowledgedEvent;
44+
import com.ericsson.eiffel.semantics.events.EiffelAlertCeasedEvent;
45+
import com.ericsson.eiffel.semantics.events.EiffelAlertRaisedEvent;
7346
import com.ericsson.eiffel.semantics.events.EiffelAnnouncementPublishedEvent;
7447
import com.ericsson.eiffel.semantics.events.EiffelArtifactCreatedEvent;
7548
import com.ericsson.eiffel.semantics.events.EiffelArtifactDeployedEvent;
7649
import com.ericsson.eiffel.semantics.events.EiffelArtifactPublishedEvent;
50+
import com.ericsson.eiffel.semantics.events.EiffelArtifactReusedEvent;
7751
import com.ericsson.eiffel.semantics.events.EiffelCompositionDefinedEvent;
7852
import com.ericsson.eiffel.semantics.events.EiffelConfidenceLevelModifiedEvent;
79-
import com.ericsson.eiffel.semantics.events.EiffelTestCaseCanceledEvent;
80-
import com.ericsson.eiffel.semantics.events.EiffelTestExecutionRecipeCollectionCreatedEvent;
81-
import com.ericsson.eiffel.semantics.events.EiffelTestCaseTriggeredEvent;
8253
import com.ericsson.eiffel.semantics.events.EiffelEnvironmentDefinedEvent;
8354
import com.ericsson.eiffel.semantics.events.EiffelFlowContextDefinedEvent;
55+
import com.ericsson.eiffel.semantics.events.EiffelIssueVerifiedEvent;
8456
import com.ericsson.eiffel.semantics.events.EiffelServiceAllocatedEvent;
8557
import com.ericsson.eiffel.semantics.events.EiffelServiceDeployedEvent;
8658
import com.ericsson.eiffel.semantics.events.EiffelServiceDiscontinuedEvent;
@@ -89,12 +61,13 @@
8961
import com.ericsson.eiffel.semantics.events.EiffelServiceStoppedEvent;
9062
import com.ericsson.eiffel.semantics.events.EiffelSourceChangeCreatedEvent;
9163
import com.ericsson.eiffel.semantics.events.EiffelSourceChangeSubmittedEvent;
64+
import com.ericsson.eiffel.semantics.events.EiffelTestCaseCanceledEvent;
9265
import com.ericsson.eiffel.semantics.events.EiffelTestCaseFinishedEvent;
9366
import com.ericsson.eiffel.semantics.events.EiffelTestCaseStartedEvent;
67+
import com.ericsson.eiffel.semantics.events.EiffelTestCaseTriggeredEvent;
68+
import com.ericsson.eiffel.semantics.events.EiffelTestExecutionRecipeCollectionCreatedEvent;
9469
import com.ericsson.eiffel.semantics.events.EiffelTestSuiteFinishedEvent;
9570
import com.ericsson.eiffel.semantics.events.EiffelTestSuiteStartedEvent;
96-
import com.ericsson.eiffel.semantics.events.EiffelIssueVerifiedEvent;
97-
import com.ericsson.eiffel.semantics.events.EiffelArtifactReusedEvent;
9871
import com.ericsson.eiffel.semantics.events.Event;
9972
import com.ericsson.eiffel.semantics.events.Gav;
10073
import com.ericsson.eiffel.semantics.events.Serializer;
@@ -103,6 +76,7 @@
10376
import com.google.gson.JsonElement;
10477
import com.google.gson.JsonObject;
10578
import com.google.gson.JsonParser;
79+
import com.google.gson.JsonSyntaxException;
10680

10781
@Named("eiffel-semantics")
10882
public class SemanticsService implements MsgService {
@@ -177,50 +151,55 @@ public static Map<EiffelEventType, Class<? extends Event>> eventType() {
177151
eventTypes.put(SERVICE_DEPLOYED, EiffelServiceDeployedEvent.class);
178152
eventTypes.put(SERVICE_ALLOCATED, EiffelServiceAllocatedEvent.class);
179153
eventTypes.put(ARTIFACT_DEPLOYED, EiffelArtifactDeployedEvent.class);
180-
eventTypes.put(ANNOUNCEMENT_ACKNOWLEDGED, EiffelAnnouncementAcknowledgedEvent.class);
154+
eventTypes.put(ALERT_ACKNOWLEDGED, EiffelAlertAcknowledgedEvent.class);
155+
eventTypes.put(ALERT_CEASED, EiffelAlertCeasedEvent.class);
156+
eventTypes.put(ALERT_RAISED, EiffelAlertRaisedEvent.class);
181157

182158
return eventTypes;
183159
}
184160

185161
@Override
186162
public String generateMsg(String msgType, JsonObject bodyJson) {
187-
if (semanticsGavFlag) {
188-
return createErrorResponse("GAV info of eiffel-remrem-semantics is missing",
189-
"Required Serializer GAV information of eiffel-remrem-semantics is missing in MANIFEST.MF");
190-
}
191-
EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
192-
if (eiffelType == null) {
193-
log.error("Unknown message type requested: " + msgType);
194-
return createErrorResponse(msgType, supportedEventTypes);
195-
}
196-
Class<? extends Event> eventType = eventTypes.get(eiffelType);
197-
198-
JsonObject msgNodes = bodyJson.get(MSG_PARAMS).getAsJsonObject();
199-
JsonObject eventNodes = bodyJson.get(EVENT_PARAMS).getAsJsonObject();
200-
201-
// Compare the input JSON EventType with query parameter(-t) and also
202-
// check type exist or not,
203-
// if input JSON EventType is missing adding query parameter as Type.
204-
String inputEventType = getInputEventType(bodyJson);
205-
if (inputEventType == null || inputEventType.isEmpty()) {
206-
bodyJson.get(MSG_PARAMS).getAsJsonObject().get(META).getAsJsonObject().addProperty(TYPE,
207-
eiffelType.getEventName());
208-
} else if (!(inputEventType.equals(eiffelType.getEventName()))) {
209-
log.error("check the input json message type : " + inputEventType);
210-
return createErrorResponse(eiffelType.getEventName(),
211-
"Mismatch of eventype in request query parameter with property 'type' in the input json message");
212-
}
163+
try {
164+
if (semanticsGavFlag) {
165+
return createErrorResponse("GAV info of eiffel-remrem-semantics is missing",
166+
"Required Serializer GAV information of eiffel-remrem-semantics is missing in MANIFEST.MF");
167+
}
168+
EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
169+
if (eiffelType == null) {
170+
log.error("Unknown message type requested: " + msgType);
171+
return createErrorResponse(msgType, supportedEventTypes);
172+
}
173+
Class<? extends Event> eventType = eventTypes.get(eiffelType);
213174

214-
Event event = eventCreation(eventType, msgNodes, eventNodes);
175+
JsonObject msgNodes = bodyJson.get(MSG_PARAMS).getAsJsonObject();
176+
JsonObject eventNodes = bodyJson.get(EVENT_PARAMS).getAsJsonObject();
215177

216-
String result = gson.toJson(event);
217-
try {
178+
// Compare the input JSON EventType with query parameter(-t) and also
179+
// check type exist or not,
180+
// if input JSON EventType is missing adding query parameter as Type.
181+
String inputEventType = getInputEventType(bodyJson);
182+
if (inputEventType == null || inputEventType.isEmpty()) {
183+
bodyJson.get(MSG_PARAMS).getAsJsonObject().get(META).getAsJsonObject().addProperty(TYPE, eiffelType.getEventName());
184+
} else if (!(inputEventType.equals(eiffelType.getEventName()))) {
185+
log.error("check the input json message type : " + inputEventType);
186+
return createErrorResponse(eiffelType.getEventName(),
187+
"Mismatch of eventype in request query parameter with property 'type' in the input json message");
188+
}
189+
190+
Event event = eventCreation(eventType, msgNodes, eventNodes);
191+
192+
String result = gson.toJson(event);
218193
outputValidate(eiffelType, result);
194+
return result;
219195
} catch (EiffelValidationException e) {
220196
log.error("Could not validate message. Reason:" + e.getMessage() + "\nCause: " + e.getCause().toString());
221197
return createErrorResponse(e.getMessage(), e.getCause().toString());
198+
} catch (JsonSyntaxException e) {
199+
log.error("Json Syntax exception occured. Reason:" + e.getMessage() + "\nCause: " + e.getCause().toString());
200+
return createErrorResponse("Json Syntax exception occured while processing input schema", e.getCause().toString());
222201
}
223-
return result;
202+
224203
}
225204

226205
private static Event eventCreation(Class<? extends Event> eventType, JsonObject msgNodes, JsonObject eventNodes) {

‎src/main/java/com/ericsson/eiffel/remrem/semantics/clone/PrepareLocalEiffelSchemas.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ private static void cloneEiffelRepo(String repoURL, String branch, File localEif
5050
if (!localEiffelRepoPath.exists()) {
5151
try {
5252
// cloning github repository by using URL and branch name into local
53-
localGitRepo = Git.cloneRepository().setURI(repoURL).setBranch(branch).setDirectory(localEiffelRepoPath)
53+
localGitRepo = Git.cloneRepository().setURI(repoURL).setBranch("master").setDirectory(localEiffelRepoPath)
5454
.call();
55+
localGitRepo.checkout().setName(branch).call();
5556
} catch (Exception e) {
5657
e.printStackTrace();
5758
}

0 commit comments

Comments
 (0)