Merge pull request #13 from keyko-io/feature/move-enum

Move enum to the single classes to avoid overload
keyko-io · Mar 24, 2020 · 662367d · 662367d
2 parents 2a92ade + 7d352b1
commit 662367d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.keyko.monitoring</groupId>
     <artifactId>schemas</artifactId>
     <packaging>jar</packaging>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <name>Web3 Monitoring Schemas</name>
     <url>https://github.com/keyko-io/web3-monitoring-schemas</url>
 
@@ -99,12 +99,11 @@
                                 <include>**/*.avsc</include>
                             </includes>
                             <imports>
-                                <import>${project.basedir}/src/main/resources/avro/ContractEventStatus.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/NumberParameter.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/StringParameter.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/EventsRecord.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/ViewRecord.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/BlockRecord.avsc</import>
-                                <import>${project.basedir}/src/main/resources/avro/EventsRecord.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/LogRecordRecord.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/TransactionRecord.avsc</import>
                             </imports>

diff --git a/src/main/resources/avro/ContractEventStatus.avsc b/src/main/resources/avro/ContractEventStatus.avsc
diff --git a/src/main/resources/avro/EventRecord.avsc b/src/main/resources/avro/EventRecord.avsc
@@ -61,7 +61,13 @@
 		},
 		{
 			"name": "status",
-			"type": "ContractEventStatus"
+			"type": {
+				"name": "ContractEventStatus",
+				"type": "enum",
+				"symbols": [
+					"UNCONFIRMED", "CONFIRMED", "INVALIDATED"
+				]
+			}
 		},
 		{
 			"name": "eventSpecificationSignature",

diff --git a/src/main/resources/avro/LogRecord.avsc b/src/main/resources/avro/LogRecord.avsc
@@ -49,7 +49,13 @@
 		},
 		{
 			"name": "status",
-			"type": "ContractEventStatus"
+			"type": {
+				"name": "LogStatus",
+				"type": "enum",
+				"symbols": [
+					"UNCONFIRMED", "CONFIRMED", "INVALIDATED"
+				]
+			}
 		},
 		{
 			"name": "retries",

diff --git a/src/main/resources/avro/LogRecordTopicsFlattened.avsc b/src/main/resources/avro/LogRecordTopicsFlattened.avsc
@@ -61,7 +61,13 @@
 		},
 		{
 			"name": "status",
-			"type": "ContractEventStatus"
+			"type": {
+				"name": "LogFlattenedStatus",
+				"type": "enum",
+				"symbols": [
+					"UNCONFIRMED", "CONFIRMED", "INVALIDATED"
+				]
+			}
 		},
 		{
 			"name": "retries",