diff --git a/FlaskAPI/blurred_temp_image.jpeg b/FlaskAPI/blurred_temp_image.jpeg deleted file mode 100644 index 77ff865..0000000 Binary files a/FlaskAPI/blurred_temp_image.jpeg and /dev/null differ diff --git a/FlaskAPI/controllers/status.py b/FlaskAPI/controllers/status.py index 26097e5..401ccd1 100644 --- a/FlaskAPI/controllers/status.py +++ b/FlaskAPI/controllers/status.py @@ -4,4 +4,4 @@ status_blueprint = Blueprint('status_blueprint', __name__) @status_blueprint.route('/status/ok', methods=['GET']) def return_ok(): - return 200 + return '', 200 diff --git a/Spring b/Spring index dedb3c1..f8fdeb0 160000 --- a/Spring +++ b/Spring @@ -1 +1 @@ -Subproject commit dedb3c1a24270a3544e84d7e3bbbe9c331fc6270 +Subproject commit f8fdeb0dd53fd30a4bd1f8afb77135ddb8558e1c diff --git a/scripts/common.py b/scripts/common.py index e838ffa..29eade4 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -1,3 +1,4 @@ +import json import person_pb2 person_proto = person_pb2.Person() @@ -15,14 +16,14 @@ person_json = { "email": "john.doe@email.com", "phone": "123-456-7890" } -person_json = str(person_json).encode('utf-8') +person_json = json.dumps(person_json) FRAMEWORKS = [ - # ('Actix', 'tcc-actix', 'orange'), - # ('ASP.NET', 'tcc-aspnet', 'blue'), - # ('Flask', 'tcc-flask', 'grey'), + ('Actix', 'tcc-actix', 'orange'), + ('ASP.NET', 'tcc-aspnet', 'blue'), + ('Flask', 'tcc-flask', 'grey'), ('Express', 'tcc-express', 'red'), - # ('Spring', 'tcc-spring', 'green'), + ('Spring', 'tcc-spring', 'green'), ] ENDPOINTS = { @@ -36,14 +37,11 @@ ENDPOINTS = { AVG_RUNS = 5 API_REQUESTS = [ - # ('/status/ok', 'GET', range(0, 30_000, 5000), None), - # ('/simulation/harmonic-progression?n=100000', 'GET', range(0, 30_000, 5000), None), - ('/simulation/json', 'POST', range(0, 30_000, 5000), (person_json, "application/json")), - # ('/image/save-big-image', 'POST', range(0, 500, 50), (open('big-image.png', 'rb').read(), "image/png")), - # ('/image/load-small-image', 'GET', range(0, 30_000, 5000), None), - # ('/static/small-image.png', 'GET', range(0, 30_000, 5000), None), - # ('/image/load-big-image', 'GET', range(0, 500, 50), None), - # ('/static/big-image.png', 'GET', range(0, 500, 50), None), - # ('/static/nginx.html', 'GET', range(0, 30_000, 5000), None), - ('/simulation/protobuf', 'POST', range(0, 30_000, 5000), (person_proto, "application/protobuf")), + ('/status/ok', 'GET', range(0, 30_000, 5000), None), + ('/simulation/harmonic-progression?n=100000', 'GET', range(0, 30_000, 5000), None), + # ('/simulation/json', 'POST', range(0, 30_000, 5000), (person_json, "application/json")), + ('/image/save-big-image', 'POST', range(0, 500, 50), (open('big-image.png', 'rb').read(), "image/png")), + ('/static/small-image.png', 'GET', range(0, 30_000, 5000), None), + ('/static/big-image.png', 'GET', range(0, 500, 50), None), + # ('/simulation/protobuf', 'POST', range(0, 30_000, 5000), (person_proto, "application/protobuf")), ]