Commit d961c56e authored by Nathan Chambron's avatar Nathan Chambron
Browse files

Merge branch 'feature/newApiSpecs' into 'develop' 

Feature/new api specs

See merge request !3
parents 2f9558de 5a3364c0

.gitmodules

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
[submodule "arf005"]

	path = arf005

	url = https://forge.etsi.org/rep/arf/arf005.git

EtsiServerGen/CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,5 +34,5 @@ file(GLOB HDRS 
add_library(${PROJECT_NAME} ${SRCS} )

add_library(${PROJECT_NAME} ${SRCS} )

target_link_libraries(${PROJECT_NAME} pistache pthread)

target_link_libraries(${PROJECT_NAME} pistache pthread)





install(TARGETS ${PROJECT_NAME} DESTINATION /usr/lib/worldStorage)

install(TARGETS ${PROJECT_NAME} DESTINATION /usr/lib)

install(FILES ${HDRS} DESTINATION include/worldStorage)
 
install(FILES ${HDRS} DESTINATION include)

EtsiServerImpl/src/DefaultApiEtsi.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ DefaultApiEtsi::DefaultApiEtsi(const std::shared_ptr<Pistache::Rest::Router>& rt 
void DefaultApiEtsi::get_version(Pistache::Http::ResponseWriter &response) {

void DefaultApiEtsi::get_version(Pistache::Http::ResponseWriter &response) {

    response.send(Pistache::Http::Code::Ok, "Version 0.0.1\n");

    response.send(Pistache::Http::Code::Ok, "Version 0.0.1\n");

}

}

void DefaultApiEtsi::ping_get(Pistache::Http::ResponseWriter &response) {

void DefaultApiEtsi::get_ping(Pistache::Http::ResponseWriter &response) {

    response.send(Pistache::Http::Code::Ok, "Server online !\n Have fun\n");

    response.send(Pistache::Http::Code::Ok, "Server online !\n Have fun\n");

}

}

EtsiServerImpl/src/DefaultApiEtsi.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ public: 
    ~DefaultApiEtsi() override = default;

    ~DefaultApiEtsi() override = default;





    void get_version(Pistache::Http::ResponseWriter &response);

    void get_version(Pistache::Http::ResponseWriter &response);

    void ping_get(Pistache::Http::ResponseWriter &response);

    void get_ping(Pistache::Http::ResponseWriter &response);





};

};

arf005 @ 5da5faa7

Original line number Original line Diff line number Diff line 
Subproject commit 5da5faa719bcb310bc57ae97168e582218d1355c