Remove swagger and minor feature extensions and bug fixes

- Various Bug fixes and improvements
- Management API extended
- Swagger removed
- Guava Upgraded to 19
This commit is contained in:
Kai Zimmermann
2016-01-21 13:42:38 +01:00
parent fb9dfd204c
commit 64deaeea3c
813 changed files with 9787 additions and 4929 deletions

View File

@@ -22,6 +22,6 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@JsonIgnoreProperties(ignoreUnknown = true)
public enum ActionStatus {
DOWNLOAD, RETRIEVED, RUNNING, FINISHED, ERROR, WARNING;
DOWNLOAD, RETRIEVED, RUNNING, FINISHED, ERROR, WARNING, CANCELED, CANCEL_REJECTED;
}

View File

@@ -8,7 +8,7 @@
*/
package org.eclipse.hawkbit.dmf.json.model;
import java.util.HashMap;
import java.util.EnumMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* JSON representation of artifact.
*
*
*
*
*/
@@ -28,11 +28,9 @@ public class Artifact {
/**
* Represented the supported protocols for artifact url's.
*
*
*
*/
public static enum UrlProtocol {
public enum UrlProtocol {
COAP, HTTP, HTTPS
}
@@ -46,7 +44,7 @@ public class Artifact {
private Long size;
@JsonProperty
private Map<UrlProtocol, String> urls = new HashMap<>();
private Map<UrlProtocol, String> urls = new EnumMap<>(UrlProtocol.class);
public Map<UrlProtocol, String> getUrls() {
return urls;

View File

@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* JSON representation of download and update request.
*
*
*
*
*
@@ -29,7 +29,7 @@ public class DownloadAndUpdateRequest {
@JsonProperty
private Long actionId;
@JsonProperty
private final List<SoftwareModule> softwareModules = new LinkedList<SoftwareModule>();
private final List<SoftwareModule> softwareModules = new LinkedList<>();
public Long getActionId() {
return actionId;
@@ -45,7 +45,7 @@ public class DownloadAndUpdateRequest {
/**
* Add a Software module.
*
*
* @param createSoftwareModule
* the module
*/

View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* JSON representation of a software module.
*
*
*
*
*
@@ -35,7 +35,7 @@ public class SoftwareModule {
@JsonProperty
private String moduleVersion;
@JsonProperty
private List<Artifact> artifacts = new LinkedList<Artifact>();
private List<Artifact> artifacts = new LinkedList<>();
public String getModuleType() {
return moduleType;