Updated restbuck example to avoid using the new (since 17.01) JSON serialization component.
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="simple_db" uuid="1A6B9D12-25F5-4BB8-98C0-DB6FDE9CCE18" library_target="simple_db">
|
||||
<target name="simple_db">
|
||||
<root all_classes="true"/>
|
||||
<option warning="true" void_safety="all">
|
||||
</option>
|
||||
<setting name="concurrency" value="scoop"/>
|
||||
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
|
||||
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
|
||||
<cluster name="src" location="src\" recursive="true">
|
||||
<file_rule>
|
||||
<exclude>/.*json.*\.e$</exclude>
|
||||
<condition>
|
||||
<version type="compiler" max="17.0.0.0"/>
|
||||
</condition>
|
||||
</file_rule>
|
||||
</cluster>
|
||||
</target>
|
||||
</system>
|
||||
19
examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf
Normal file
19
examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf
Normal file
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="simple_db" uuid="1A6B9D12-25F5-4BB8-98C0-DB6FDE9CCE18" library_target="simple_db">
|
||||
<target name="simple_db">
|
||||
<root all_classes="true"/>
|
||||
<option warning="true" void_safety="none">
|
||||
</option>
|
||||
<setting name="concurrency" value="scoop"/>
|
||||
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
|
||||
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
|
||||
<cluster name="src" location="src\" recursive="true">
|
||||
<file_rule>
|
||||
<exclude>/.*json.*\.e$</exclude>
|
||||
<condition>
|
||||
<version type="compiler" max="17.0.0.0"/>
|
||||
</condition>
|
||||
</file_rule>
|
||||
</cluster>
|
||||
</target>
|
||||
</system>
|
||||
@@ -0,0 +1,44 @@
|
||||
note
|
||||
description: "[
|
||||
Basic database for simple example.
|
||||
|
||||
(no concurrency access control, ...)
|
||||
]"
|
||||
date: "$Date$"
|
||||
revision: "$Revision$"
|
||||
|
||||
deferred class
|
||||
BASIC_DATABASE
|
||||
|
||||
feature -- Access
|
||||
|
||||
count_of (a_entry_type: TYPE [detachable ANY]): INTEGER
|
||||
deferred
|
||||
end
|
||||
|
||||
has (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Has entry of type `a_entry_type` associated with id `a_id`?
|
||||
deferred
|
||||
end
|
||||
|
||||
item (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): detachable ANY
|
||||
deferred
|
||||
end
|
||||
|
||||
save (a_entry_type: TYPE [detachable ANY]; a_entry: detachable ANY; cl_entry_id: CELL [detachable READABLE_STRING_GENERAL])
|
||||
deferred
|
||||
ensure
|
||||
has_id: cl_entry_id.item /= Void
|
||||
end
|
||||
|
||||
delete (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL)
|
||||
require
|
||||
has_item: has (a_entry_type, a_id)
|
||||
deferred
|
||||
ensure
|
||||
has_not_item: not has (a_entry_type, a_id)
|
||||
end
|
||||
note
|
||||
copyright: "2011-2017, Javier Velilla and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
end
|
||||
@@ -0,0 +1,177 @@
|
||||
note
|
||||
description: "[
|
||||
Basic database for simple example using JSON files.
|
||||
|
||||
(no concurrency access control, ...)
|
||||
]"
|
||||
date: "$Date$"
|
||||
revision: "$Revision$"
|
||||
|
||||
class
|
||||
BASIC_JSON_FS_DATABASE
|
||||
|
||||
inherit
|
||||
BASIC_DATABASE
|
||||
|
||||
create
|
||||
make
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_location: PATH)
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
location := a_location
|
||||
create serialization
|
||||
ensure_directory_exists (a_location)
|
||||
end
|
||||
|
||||
feature -- Access serialization
|
||||
|
||||
serialization: JSON_SERIALIZATION
|
||||
|
||||
feature -- Access
|
||||
|
||||
location: PATH
|
||||
|
||||
feature -- Access
|
||||
|
||||
count_of (a_entry_type: TYPE [detachable ANY]): INTEGER
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
create d.make_with_path (location.extended (entry_type_name (a_entry_type)))
|
||||
if d.exists then
|
||||
across
|
||||
d.entries as ic
|
||||
loop
|
||||
if attached ic.item.extension as e and then e.is_case_insensitive_equal ("json") then
|
||||
Result := Result + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
has (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Has entry of type `a_entry_type` associated with id `a_id`?
|
||||
local
|
||||
fut: FILE_UTILITIES
|
||||
do
|
||||
Result := fut.file_path_exists (entry_path (a_entry_type, a_id))
|
||||
end
|
||||
|
||||
item (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): detachable ANY
|
||||
local
|
||||
f: RAW_FILE
|
||||
s: STRING
|
||||
do
|
||||
create f.make_with_path (entry_path (a_entry_type, a_id))
|
||||
if f.exists then
|
||||
create s.make (f.count)
|
||||
f.open_read
|
||||
from
|
||||
until
|
||||
f.exhausted or f.end_of_file
|
||||
loop
|
||||
f.read_stream (1_024)
|
||||
s.append (f.last_string)
|
||||
end
|
||||
f.close
|
||||
Result := serialization.from_json_string (s, a_entry_type)
|
||||
end
|
||||
end
|
||||
|
||||
save (a_entry_type: TYPE [detachable ANY]; a_entry: detachable ANY; cl_entry_id: CELL [detachable READABLE_STRING_GENERAL])
|
||||
local
|
||||
f: RAW_FILE
|
||||
l_id: detachable READABLE_STRING_GENERAL
|
||||
do
|
||||
l_id := cl_entry_id.item
|
||||
if l_id = Void then
|
||||
l_id := next_identifier (a_entry_type)
|
||||
cl_entry_id.replace (l_id)
|
||||
end
|
||||
create f.make_with_path (entry_path (a_entry_type, l_id))
|
||||
ensure_directory_exists (f.path.parent)
|
||||
f.open_write
|
||||
f.put_string (serialization.to_json (a_entry).representation)
|
||||
f.close
|
||||
end
|
||||
|
||||
delete (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL)
|
||||
local
|
||||
f: RAW_FILE
|
||||
do
|
||||
create f.make_with_path (entry_path (a_entry_type, a_id))
|
||||
if f.exists and then f.is_access_writable then
|
||||
f.delete
|
||||
end
|
||||
end
|
||||
|
||||
feature {NONE} -- Implementation
|
||||
|
||||
ensure_directory_exists (dn: PATH)
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
create d.make_with_path (dn)
|
||||
if not d.exists then
|
||||
d.recursive_create_dir
|
||||
end
|
||||
end
|
||||
|
||||
entry_path (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): PATH
|
||||
do
|
||||
Result := location.extended (entry_type_name (a_entry_type)).extended (a_id).appended_with_extension ("json")
|
||||
end
|
||||
|
||||
entry_type_name (a_entry_type: TYPE [detachable ANY]): STRING
|
||||
do
|
||||
Result := a_entry_type.name.as_lower
|
||||
Result.prune_all ('!')
|
||||
end
|
||||
|
||||
last_id_file_path (a_entry_type: TYPE [detachable ANY]): PATH
|
||||
do
|
||||
Result := location.extended (entry_type_name (a_entry_type)).extended ("last-id")
|
||||
end
|
||||
|
||||
next_identifier (a_entry_type: TYPE [detachable ANY]): STRING_8
|
||||
local
|
||||
i: NATURAL_64
|
||||
f: RAW_FILE
|
||||
s: STRING
|
||||
do
|
||||
create f.make_with_path (last_id_file_path (a_entry_type))
|
||||
ensure_directory_exists (f.path.parent)
|
||||
if f.exists then
|
||||
create s.make (f.count)
|
||||
f.open_read
|
||||
f.read_line
|
||||
s := f.last_string
|
||||
f.close
|
||||
if s.is_natural_64 then
|
||||
i := s.to_natural_64
|
||||
end
|
||||
end
|
||||
from
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
until
|
||||
not has (a_entry_type, Result)
|
||||
loop
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
end
|
||||
f.open_write
|
||||
f.put_string (Result)
|
||||
f.close
|
||||
end
|
||||
|
||||
invariant
|
||||
|
||||
note
|
||||
copyright: "2011-2017, Javier Velilla and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
end
|
||||
@@ -0,0 +1,104 @@
|
||||
note
|
||||
description: "[
|
||||
Basic database for simple example based on memory.
|
||||
|
||||
WARNING: for now, not concurrent compliant.
|
||||
]"
|
||||
date: "$Date$"
|
||||
revision: "$Revision$"
|
||||
|
||||
class
|
||||
BASIC_MEMORY_DATABASE
|
||||
|
||||
inherit
|
||||
BASIC_DATABASE
|
||||
|
||||
create
|
||||
make
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make
|
||||
do
|
||||
create collections.make (0)
|
||||
end
|
||||
|
||||
collections: HASH_TABLE [STRING_TABLE [detachable ANY], TYPE [detachable ANY]]
|
||||
|
||||
feature -- Access
|
||||
|
||||
count_of (a_entry_type: TYPE [detachable ANY]): INTEGER
|
||||
do
|
||||
if attached collections.item (a_entry_type) as tb then
|
||||
Result := tb.count
|
||||
end
|
||||
end
|
||||
|
||||
has (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Has entry of type `a_entry_type` associated with id `a_id`?
|
||||
do
|
||||
if attached collections.item (a_entry_type) as tb then
|
||||
Result := tb.has_key (a_id)
|
||||
end
|
||||
end
|
||||
|
||||
item (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): detachable ANY
|
||||
do
|
||||
if attached collections.item (a_entry_type) as tb then
|
||||
Result := tb.item (a_id)
|
||||
end
|
||||
end
|
||||
|
||||
save (a_entry_type: TYPE [detachable ANY]; a_entry: detachable ANY; cl_entry_id: CELL [detachable READABLE_STRING_GENERAL])
|
||||
local
|
||||
tb: detachable STRING_TABLE [detachable ANY]
|
||||
l_id: detachable READABLE_STRING_GENERAL
|
||||
do
|
||||
tb := collections.item (a_entry_type)
|
||||
if tb = Void then
|
||||
create tb.make (100)
|
||||
collections.force (tb, a_entry_type)
|
||||
end
|
||||
l_id := cl_entry_id.item
|
||||
if l_id = Void then
|
||||
l_id := next_identifier (a_entry_type)
|
||||
cl_entry_id.replace (l_id)
|
||||
end
|
||||
tb.force (a_entry, l_id)
|
||||
end
|
||||
|
||||
delete (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL)
|
||||
do
|
||||
if attached collections.item (a_entry_type) as tb then
|
||||
tb.remove (a_id)
|
||||
end
|
||||
end
|
||||
|
||||
feature {NONE} -- Implementation
|
||||
|
||||
next_identifier (a_entry_type: TYPE [detachable ANY]): STRING_8
|
||||
local
|
||||
i: INTEGER
|
||||
f: RAW_FILE
|
||||
s: STRING
|
||||
do
|
||||
if attached collections.item (a_entry_type) as tb then
|
||||
i := tb.count
|
||||
else
|
||||
i := 0
|
||||
end
|
||||
from
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
until
|
||||
not has (a_entry_type, Result)
|
||||
loop
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
end
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2017, Javier Velilla and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
end
|
||||
@@ -0,0 +1,174 @@
|
||||
note
|
||||
description: "[
|
||||
Basic database for simple example using SED files.
|
||||
|
||||
(no concurrency access control, ...)
|
||||
]"
|
||||
date: "$Date$"
|
||||
revision: "$Revision$"
|
||||
|
||||
class
|
||||
BASIC_SED_FS_DATABASE
|
||||
|
||||
inherit
|
||||
BASIC_DATABASE
|
||||
|
||||
create
|
||||
make
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_location: PATH)
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
location := a_location
|
||||
create serialization
|
||||
ensure_directory_exists (a_location)
|
||||
end
|
||||
|
||||
feature -- Access
|
||||
|
||||
location: PATH
|
||||
|
||||
serialization: SED_STORABLE_FACILITIES
|
||||
|
||||
feature -- Access
|
||||
|
||||
count_of (a_entry_type: TYPE [detachable ANY]): INTEGER
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
create d.make_with_path (location.extended (entry_type_name (a_entry_type)))
|
||||
if d.exists then
|
||||
across
|
||||
d.entries as ic
|
||||
loop
|
||||
if attached ic.item.extension as e and then e.is_case_insensitive_equal ("sed") then
|
||||
Result := Result + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
has (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Has entry of type `a_entry_type` associated with id `a_id`?
|
||||
local
|
||||
fut: FILE_UTILITIES
|
||||
do
|
||||
Result := fut.file_path_exists (entry_path (a_entry_type, a_id))
|
||||
end
|
||||
|
||||
item (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): detachable ANY
|
||||
local
|
||||
f: RAW_FILE
|
||||
s: STRING
|
||||
l_reader: SED_MEDIUM_READER_WRITER
|
||||
do
|
||||
create f.make_with_path (entry_path (a_entry_type, a_id))
|
||||
if f.exists then
|
||||
create s.make (f.count)
|
||||
f.open_read
|
||||
create l_reader.make_for_reading (f)
|
||||
Result := serialization.retrieved (l_reader, True)
|
||||
f.close
|
||||
end
|
||||
end
|
||||
|
||||
save (a_entry_type: TYPE [detachable ANY]; a_entry: detachable ANY; cl_entry_id: CELL [detachable READABLE_STRING_GENERAL])
|
||||
local
|
||||
f: RAW_FILE
|
||||
l_id: detachable READABLE_STRING_GENERAL
|
||||
l_writer: SED_MEDIUM_READER_WRITER
|
||||
do
|
||||
l_id := cl_entry_id.item
|
||||
if l_id = Void then
|
||||
l_id := next_identifier (a_entry_type)
|
||||
cl_entry_id.replace (l_id)
|
||||
end
|
||||
create f.make_with_path (entry_path (a_entry_type, l_id))
|
||||
ensure_directory_exists (f.path.parent)
|
||||
f.open_write
|
||||
if a_entry /= Void then
|
||||
create l_writer.make_for_writing (f)
|
||||
serialization.store (a_entry, l_writer)
|
||||
end
|
||||
f.close
|
||||
end
|
||||
|
||||
delete (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL)
|
||||
local
|
||||
f: RAW_FILE
|
||||
do
|
||||
create f.make_with_path (entry_path (a_entry_type, a_id))
|
||||
if f.exists and then f.is_access_writable then
|
||||
f.delete
|
||||
end
|
||||
end
|
||||
|
||||
feature {NONE} -- Implementation
|
||||
|
||||
ensure_directory_exists (dn: PATH)
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
create d.make_with_path (dn)
|
||||
if not d.exists then
|
||||
d.recursive_create_dir
|
||||
end
|
||||
end
|
||||
|
||||
entry_path (a_entry_type: TYPE [detachable ANY]; a_id: READABLE_STRING_GENERAL): PATH
|
||||
do
|
||||
Result := location.extended (entry_type_name (a_entry_type)).extended (a_id).appended_with_extension ("sed")
|
||||
end
|
||||
|
||||
entry_type_name (a_entry_type: TYPE [detachable ANY]): STRING
|
||||
do
|
||||
Result := a_entry_type.name.as_lower
|
||||
Result.prune_all ('!')
|
||||
end
|
||||
|
||||
last_id_file_path (a_entry_type: TYPE [detachable ANY]): PATH
|
||||
do
|
||||
Result := location.extended (entry_type_name (a_entry_type)).extended ("last-id")
|
||||
end
|
||||
|
||||
next_identifier (a_entry_type: TYPE [detachable ANY]): STRING_8
|
||||
local
|
||||
i: NATURAL_64
|
||||
f: RAW_FILE
|
||||
s: STRING
|
||||
do
|
||||
create f.make_with_path (last_id_file_path (a_entry_type))
|
||||
ensure_directory_exists (f.path.parent)
|
||||
if f.exists then
|
||||
create s.make (f.count)
|
||||
f.open_read
|
||||
f.read_line
|
||||
s := f.last_string
|
||||
f.close
|
||||
if s.is_natural_64 then
|
||||
i := s.to_natural_64
|
||||
end
|
||||
end
|
||||
from
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
until
|
||||
not has (a_entry_type, Result)
|
||||
loop
|
||||
i := i + 1
|
||||
Result := i.out
|
||||
end
|
||||
f.open_write
|
||||
f.put_string (Result)
|
||||
f.close
|
||||
end
|
||||
|
||||
invariant
|
||||
|
||||
note
|
||||
copyright: "2011-2017, Javier Velilla and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
end
|
||||
Reference in New Issue
Block a user