lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client' of https://github.com/bsinno/hawkbit.git into Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client

Browse Source 
Conflicts:
	hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/api/RootControllerDdiApi.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
Jonathan Philip Knoblauch
2016-04-20 15:29:03 +02:00
parent 8d34170515 8a22ea3df3
commit a5fcd1eeb6
25 changed files with 209 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/DdiClient.java
View File

@@ -6,9 +6,9 @@ package org.eclipse.hawkbit.ddi.client;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.hawkbit.ddi.ControllerConstants;
import org.eclipse.hawkbit.ddi.client.resource.RootControllerResourceClient;
import org.eclipse.hawkbit.ddi.model.ControllerBase;
import org.eclipse.hawkbit.ddi.json.model.DdiControllerBase;
import org.eclipse.hawkbit.ddi.rest.api.DdiRestConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.netflix.feign.support.ResponseEntityDecoder;
import org.springframework.http.ResponseEntity;
@@ -39,7 +39,7 @@ public class DdiClient {
this.controllerId = controllerId;
this.name = name;
this.description = description;
rootControllerResourcePath = rolloutsUrl + ControllerConstants.BASE_V1_REQUEST_MAPPING;
rootControllerResourcePath = rolloutsUrl + DdiRestConstants.BASE_V1_REQUEST_MAPPING;
rootControllerResourcePath = rootControllerResourcePath.replace("{tenant}", tenant);
createFeignClient();
@@ -71,8 +71,9 @@ public class DdiClient {
// final HttpServletRequest request = new;
final ResponseEntity<ControllerBase> response = rootControllerResourceClient.getControllerBase("test", request);
final ControllerBase controllerBase = response.getBody();
final ResponseEntity<DdiControllerBase> response = rootControllerResourceClient.getControllerBase("test",
request);
final DdiControllerBase controllerBase = response.getBody();
// TODO notify every 10 seconds on the rollout server

4
examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/resource/RootControllerResourceClient.java
View File

@@ -3,13 +3,13 @@
*/
package org.eclipse.hawkbit.ddi.client.resource;
import org.eclipse.hawkbit.ddi.api.RootControllerDdiApi;
import org.eclipse.hawkbit.ddi.rest.api.DdiRootControllerRestApi;
import org.springframework.cloud.netflix.feign.FeignClient;
/**
* Client binding for the Rootcontroller resource of the DDI API.
*/
@FeignClient(url = "${hawkbit.url:localhost:8080}/{tenant}/controller/v1")
public interface RootControllerResourceClient extends RootControllerDdiApi {
public interface RootControllerResourceClient extends DdiRootControllerRestApi {
}