Skip to content

Commit 29ba65c

Browse files
zrdgthrSantosh NC
zrdgthr
authored and
Santosh NC
committed
List all available events in Agen Edition. (#105)
* List all available events in Agen Edition.
1 parent 1df941a commit 29ba65c

File tree

192 files changed

+4359
-2850
lines changed

Some content is hidden

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

192 files changed

+4359
-2850
lines changed

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
<cleanupDaemonThreads>false</cleanupDaemonThreads>
106106
<mainClass>com.ericsson.eiffel.remrem.semantics.clone.PrepareLocalEiffelSchemas</mainClass>
107107
<arguments>
108-
<argument>https://github.com/Ericsson/eiffel.git</argument>
109-
<argument>tags/edition-toulouse</argument>
108+
<argument>https://github.com/eiffel-community/eiffel.git</argument>
109+
<argument>tags/edition-agen</argument>
110110
<argument>https://github.com/Ericsson/eiffel-operations-extension.git</argument>
111-
<argument>tags/Toulouse</argument>
111+
<argument>tags/edition-agen</argument>
112112
</arguments>
113113
</configuration>
114114
</plugin>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public enum EiffelEventType {
4949
ARTIFACT_DEPLOYED("EiffelArtifactDeployedEvent"),
5050
ALERT_ACKNOWLEDGED("EiffelAlertAcknowledgedEvent"),
5151
ALERT_CEASED("EiffelAlertCeasedEvent"),
52-
ALERT_RAISED("EiffelAlertRaisedEvent");
52+
ALERT_RAISED("EiffelAlertRaisedEvent"),
53+
ISSUE_DEFINED("EiffelIssueDefinedEvent");
5354

5455
private String eventType;
5556

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ public enum LinkType {
4646
ALERT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
4747
MODIFIED_ALERT(EiffelConstants.MULTIPLE_NOT_ALLOWED),
4848
ARTIFACT_DEPLOYED(EiffelConstants.MULTIPLE_ALLOWED),
49-
SERVICE(EiffelConstants.MULTIPLE_NOT_ALLOWED);
49+
SERVICE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
50+
SUCCESSFUL_ISSUE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
51+
FAILED_ISSUE(EiffelConstants.MULTIPLE_NOT_ALLOWED),
52+
INCONCLUSIVE_ISSUE(EiffelConstants.MULTIPLE_NOT_ALLOWED);
53+
5054

5155
private final boolean multipleAllowed;
5256

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public enum RoutingKeyTypes {
4949
EiffelServiceStartedEvent(EiffelConstants.SERVICE,"started"),
5050
EiffelServiceStoppedEvent(EiffelConstants.SERVICE,"stopped"),
5151
EiffelAlertRaisedEvent(EiffelConstants.ALERT,"raised"),
52-
EiffelAlertCeasedEvent(EiffelConstants.ALERT,"ceased");
52+
EiffelAlertCeasedEvent(EiffelConstants.ALERT,"ceased"),
53+
EiffelIssueDefinedEvent(EiffelConstants.TEST,"issuedefined");
5354

5455

5556
private final String family; // family

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

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

17-
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.*;
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.ALERT_ACKNOWLEDGED;
22+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ALERT_CEASED;
23+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ALERT_RAISED;
24+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ANNOUNCEMENT_PUBLISHED;
25+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_CREATED;
26+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_DEPLOYED;
27+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_PUBLISHED;
28+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_REUSED;
29+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.COMPOSITION_DEFINED;
30+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.CONFIDENCELEVEL_MODIFIED;
31+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ENVIRONMENT_DEFINED;
32+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.EXECUTION_RECIPE_COLLECTION_CREATED;
33+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.FLOWCONTEXT_DEFINED;
34+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ISSUE_DEFINED;
35+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ISSUE_VERIFIED;
36+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_ALLOCATED;
37+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_DEPLOYED;
38+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_DISCONTINUED;
39+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_RETURNED;
40+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_STARTED;
41+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SERVICE_STOPPED;
42+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SOURCECHANGE_CREATED;
43+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.SOURCECHANGE_SUBMITTED;
44+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_CANCELED;
45+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_FINISHED;
46+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_STARTED;
47+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTCASE_TRIGGERED;
48+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTSUITE_FINISHED;
49+
import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.TESTSUITE_STARTED;
1850

1951
import java.io.InputStream;
2052
import java.io.InputStreamReader;
@@ -52,6 +84,7 @@
5284
import com.ericsson.eiffel.semantics.events.EiffelConfidenceLevelModifiedEvent;
5385
import com.ericsson.eiffel.semantics.events.EiffelEnvironmentDefinedEvent;
5486
import com.ericsson.eiffel.semantics.events.EiffelFlowContextDefinedEvent;
87+
import com.ericsson.eiffel.semantics.events.EiffelIssueDefinedEvent;
5588
import com.ericsson.eiffel.semantics.events.EiffelIssueVerifiedEvent;
5689
import com.ericsson.eiffel.semantics.events.EiffelServiceAllocatedEvent;
5790
import com.ericsson.eiffel.semantics.events.EiffelServiceDeployedEvent;
@@ -69,8 +102,6 @@
69102
import com.ericsson.eiffel.semantics.events.EiffelTestSuiteFinishedEvent;
70103
import com.ericsson.eiffel.semantics.events.EiffelTestSuiteStartedEvent;
71104
import com.ericsson.eiffel.semantics.events.Event;
72-
import com.ericsson.eiffel.semantics.events.Gav;
73-
import com.ericsson.eiffel.semantics.events.Serializer;
74105
import com.ericsson.eiffel.semantics.events.Source;
75106
import com.google.gson.Gson;
76107
import com.google.gson.JsonElement;
@@ -99,8 +130,8 @@ public class SemanticsService implements MsgService {
99130
private final ArrayList<String> supportedEventTypes = new ArrayList<String>();
100131
public static final Logger log = LoggerFactory.getLogger(SemanticsService.class);
101132
private Event event = new Event();
102-
public static Gav semanticsGAV;
103-
private boolean semanticsGavFlag = false;
133+
public static String purlSerializer;
134+
private boolean purlSerializerFlag = false;
104135
private static Gson gson = new Gson();
105136
private static Map<EiffelEventType, Class<? extends Event>> eventTypes = SemanticsService.eventType();
106137

@@ -113,10 +144,9 @@ public SemanticsService() {
113144
@PostConstruct
114145
public void readManifest() {
115146
ManifestHandler manifastHandler = new ManifestHandler();
116-
semanticsGAV = manifastHandler.readGavfromManifest();
117-
if (semanticsGAV == null || semanticsGAV.getArtifactId() == null || semanticsGAV.getGroupId() == null
118-
|| semanticsGAV.getVersion() == null) {
119-
semanticsGavFlag = true;
147+
purlSerializer = manifastHandler.readSemanticsSerializerFromManifest();
148+
if (purlSerializer != null && !purlSerializer.isEmpty()) {
149+
purlSerializerFlag = true;
120150
}
121151
}
122152

@@ -154,16 +184,17 @@ public static Map<EiffelEventType, Class<? extends Event>> eventType() {
154184
eventTypes.put(ALERT_ACKNOWLEDGED, EiffelAlertAcknowledgedEvent.class);
155185
eventTypes.put(ALERT_CEASED, EiffelAlertCeasedEvent.class);
156186
eventTypes.put(ALERT_RAISED, EiffelAlertRaisedEvent.class);
187+
eventTypes.put(ISSUE_DEFINED, EiffelIssueDefinedEvent.class);
157188

158189
return eventTypes;
159190
}
160191

161192
@Override
162193
public String generateMsg(String msgType, JsonObject bodyJson) {
163194
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");
195+
if (purlSerializerFlag) {
196+
return createErrorResponse("Serializer info of eiffel-remrem-semantics is missing",
197+
"Required Serializer information of eiffel-remrem-semantics is missing in MANIFEST.MF");
167198
}
168199
EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
169200
if (eiffelType == null) {
@@ -175,12 +206,15 @@ public String generateMsg(String msgType, JsonObject bodyJson) {
175206
JsonObject msgNodes = bodyJson.get(MSG_PARAMS).getAsJsonObject();
176207
JsonObject eventNodes = bodyJson.get(EVENT_PARAMS).getAsJsonObject();
177208

178-
// Compare the input JSON EventType with query parameter(-t) and also
209+
// Compare the input JSON EventType with query parameter(-t) and
210+
// also
179211
// check type exist or not,
180-
// if input JSON EventType is missing adding query parameter as Type.
212+
// if input JSON EventType is missing adding query parameter as
213+
// Type.
181214
String inputEventType = getInputEventType(bodyJson);
182215
if (inputEventType == null || inputEventType.isEmpty()) {
183-
bodyJson.get(MSG_PARAMS).getAsJsonObject().get(META).getAsJsonObject().addProperty(TYPE, eiffelType.getEventName());
216+
bodyJson.get(MSG_PARAMS).getAsJsonObject().get(META).getAsJsonObject().addProperty(TYPE,
217+
eiffelType.getEventName());
184218
} else if (!(inputEventType.equals(eiffelType.getEventName()))) {
185219
log.error("check the input json message type : " + inputEventType);
186220
return createErrorResponse(eiffelType.getEventName(),
@@ -196,8 +230,10 @@ public String generateMsg(String msgType, JsonObject bodyJson) {
196230
log.error("Could not validate message. Reason:" + e.getMessage() + "\nCause: " + e.getCause().toString());
197231
return createErrorResponse(e.getMessage(), e.getCause().toString());
198232
} catch (JsonSyntaxException e) {
199-
log.error("Json Syntax exception occurred. Reason:" + e.getMessage() + "\nCause: " + e.getCause().toString());
200-
return createErrorResponse("Json Syntax exception occured while processing input schema", e.getCause().toString());
233+
log.error(
234+
"Json Syntax exception occurred. Reason:" + e.getMessage() + "\nCause: " + e.getCause().toString());
235+
return createErrorResponse("Json Syntax exception occured while processing input schema",
236+
e.getCause().toString());
201237
}
202238

203239
}
@@ -266,25 +302,25 @@ public String getEventType(JsonObject json) {
266302
}
267303
return null;
268304
}
269-
305+
270306
@Override
271307
public Collection<String> getSupportedEventTypes() {
272-
return supportedEventTypes;
308+
return supportedEventTypes;
273309
}
274-
310+
275311
/**
276-
* Gets the path to an event template file that must be in lowercase
277-
* and read through a resource stream. Stream is parsed into a
278-
* JsonElement.
312+
* Gets the path to an event template file that must be in lowercase and
313+
* read through a resource stream. Stream is parsed into a JsonElement.
279314
*
280-
* @param String eventType
315+
* @param String
316+
* eventType
281317
*
282318
* @return json element containing an event template
283319
*/
284320
@Override
285-
public JsonElement getEventTemplate(String eventType) {
286-
String path = "templates/"+eventType.toLowerCase()+".json";
287-
InputStream fileStream = getClass().getClassLoader().getResourceAsStream(path);
321+
public JsonElement getEventTemplate(String eventType) {
322+
String path = "templates/" + eventType.toLowerCase() + ".json";
323+
InputStream fileStream = getClass().getClassLoader().getResourceAsStream(path);
288324
JsonElement json = null;
289325
JsonParser parser = new JsonParser();
290326
try {
@@ -403,10 +439,7 @@ public String generateRoutingKey(JsonObject eiffelMessage, String tag, String do
403439
*/
404440
public static Source setSerializerGav(Source source) {
405441
source = source == null ? new Source() : source;
406-
Serializer serializer = source.getSerializer() == null ? new Serializer() : source.getSerializer();
407-
serializer.setGroupId(semanticsGAV.getGroupId());
408-
serializer.setArtifactId(semanticsGAV.getArtifactId());
409-
serializer.setVersion(semanticsGAV.getVersion());
442+
String serializer = source.getSerializer() == null ? purlSerializer : source.getSerializer();
410443
source.setSerializer(serializer);
411444
return source;
412445
}

0 commit comments

Comments
 (0)