Updated EG_DEVELOPER_METADATA to_json feature.

Updated EG_DEVELOPER_METADATA_LOCATION, to be completed.
Updated EG_DEVELOPER_METATADA_VISIBILITY added feature to_json.
Updated EG_SHEETS_JSON code to reflect the changes in the previous classes.
Signed-off-by: jvelilla <[email protected]>

Author: jvelilla

sheets/src/json/eg_sheets_json.e

@@ -412,6 +412,8 @@ feature {NONE} -- JSON To Eiffel
 
 	eg_developer_metadata (a_json: JSON_VALUE): EG_DEVELOPER_METADATA
 			-- Create an object `EG_DEVELOPER_METADATA` from a json representation `a_json`.
+		local
+			l_vs: EG_DEVELOPER_METADATA_VISIBILITY
 		do
 			create Result
 			if attached integer_value_from_json (a_json, "metadataId") as l_metadata_id then
@@ -427,11 +429,13 @@ feature {NONE} -- JSON To Eiffel
 				Result.set_location (developer_metadata_location (l_location))
 			end
 			if attached string_value_from_json (a_json, "visibility") as l_visibility then
+				create l_vs
 				if l_visibility.is_case_insensitive_equal ("DOCUMENT") then
-					Result.visibility.set_document
+					l_vs.set_document
 				elseif l_visibility.is_case_insensitive_equal ("PROJECT") then
-					Result.visibility.set_project
+					l_vs.set_project
 				end
+				Result.set_visibility (l_vs)
 			end
 		end
 

sheets/src/objects/eg_developer_metadata.e

@@ -24,40 +24,22 @@ note
 class
 	EG_DEVELOPER_METADATA
 
-inherit
-	ANY
-		redefine
-			default_create
-		end
-
-create
-	default_create
-
-feature {NONE} -- Initialize
-
-	default_create
-		do
-			create metadata_key.make_empty
-			create metadata_value.make_empty
-			create location
-			create visibility
-		end
 
 feature -- Access
 
 	metadata_id: INTEGER
 		-- The spreadsheet-scoped unique ID that identifies the metadata. IDs may be specified when metadata is created, otherwise one will be randomly generated and assigned. Must be positive.
 
-	metadata_key: STRING
+	metadata_key: detachable STRING
 		-- The metadata key. There may be multiple metadata in a spreadsheet with the same key. Developer metadata must always have a key specified.
 
-	metadata_value: STRING
+	metadata_value: detachable STRING
 		-- Data associated with the metadata's key.
 
-	location: EG_DEVELOPER_METADATA_LOCATION
+	location: detachable EG_DEVELOPER_METADATA_LOCATION
 		-- The location where the metadata is associated.
 
-	visibility: EG_DEVELOPER_METADATA_VISIBILITY
+	visibility: detachable EG_DEVELOPER_METADATA_VISIBILITY
 		-- The metadata visibility. Developer metadata must always have a visibility specified.
 
 
@@ -102,9 +84,22 @@ feature -- Element Change
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
+			-- JSON representation of the current object
 		do
 			create Result.make_empty
-			-- TODO
+			Result.put (create {JSON_NUMBER}.make_integer (metadata_id), "metadataId")
+			if attached metadata_key as l_metadata_key then
+				Result.put (create {JSON_STRING}.make_from_string (l_metadata_key), "metadataKey")
+			end
+			if attached metadata_value as l_mv then
+				Result.put (create {JSON_STRING}.make_from_string (l_mv), "metadataValue")
+			end
+			if attached location as l_location then
+				Result.put (l_location.to_json, "location")
+			end
+			if attached visibility as l_visibility then
+				Result.put (l_visibility.to_json, "visibility")
+			end
 		end
 
 end

sheets/src/objects/eg_developer_metadata_location.e

@@ -22,27 +22,17 @@ note
 class
 	EG_DEVELOPER_METADATA_LOCATION
 
-inherit
-
-	ANY
-		redefine
-			default_create
-		end
+feature -- Access
 
-create
-	default_create
+	location_type: detachable EG_DEVELOPER_METADATA_LOCATION_TYPE
 
 
-feature	{NONE} -- Initialization
+feature -- Eiffel to JSON
 
-	default_create
+	to_json: JSON_OBJECT
 		do
-			create location_type
+			create Result.make_empty
+			-- TOSO
 		end
 
-feature -- Access
-
-	location_type: EG_DEVELOPER_METADATA_LOCATION_TYPE
-
-
 end

sheets/src/objects/eg_developer_metadata_visibility.e

@@ -6,7 +6,7 @@ note
 		DEVELOPER_METADATA_VISIBILITY_UNSPECIFIED 	Default value.
 		DOCUMENT 									Document-visible metadata is accessible from any developer project with access to the document.
 		PROJECT 									Project-visible metadata is only visible to and accessible by the developer project that created the metadata.
-		
+
 	]"
 	date: "$Date$"
 	revision: "$Revision$"
@@ -76,4 +76,18 @@ feature -- Status Report
 			          a_value = document or else
 			          a_value = project
 		end
+
+feature -- Eiffel to JSON
+
+	to_json: JSON_STRING
+			-- Json representation of the current object.
+		do
+			if is_document then
+				Result := "DOCUMENT"
+			elseif is_project then
+				Result := "PROJECT"
+			else
+				Result := "DEVELOPER_METADATA_VISIBILITY_UNSPECIFIED"
+			end
+		end
 end