Code Review
/
cps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add moduleSetTag to the request towards dmi plugin
[cps.git]
/
cps-ncmp-service
/
src
/
main
/
java
/
org
/
onap
/
cps
/
ncmp
/
api
/
impl
/
operations
/
DmiRequestBody.java
diff --git
a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
index
1066eac
..
f1032f8
100644
(file)
--- a/
cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
+++ b/
cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
@@
-1,6
+1,6
@@
/*
* ============LICENSE_START=======================================================
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2021-202
2
Nordix Foundation
+ * Copyright (C) 2021-202
3
Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,52
+22,38
@@
package org.onap.cps.ncmp.api.impl.operations;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.Json
Value
;
+import com.fasterxml.jackson.annotation.Json
PropertyOrder
;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
-import org.onap.cps.ncmp.api.
models.Persistence
CmHandle;
+import org.onap.cps.ncmp.api.
impl.yangmodels.YangModel
CmHandle;
@JsonInclude(JsonInclude.Include.NON_NULL)
@Getter
@Builder
@JsonInclude(JsonInclude.Include.NON_NULL)
@Getter
@Builder
+@JsonPropertyOrder({"operation", "dataType", "data", "cmHandleProperties", "requestId", "moduleSetTag"})
public class DmiRequestBody {
public class DmiRequestBody {
- public enum OperationEnum {
- READ("read"),
- CREATE("create"),
- UPDATE("update"),
- PATCH("patch"),
- DELETE("delete");
- private final String value;
- OperationEnum(final String value) {
- this.value = value;
- }
-
- @Override
- @JsonValue
- public String toString() {
- return String.valueOf(value);
- }
- }
-
- private OperationEnum operation;
+ @JsonProperty("operation")
+ private OperationType operationType;
private String dataType;
private String data;
@JsonProperty("cmHandleProperties")
private Map<String, String> dmiProperties;
private String dataType;
private String data;
@JsonProperty("cmHandleProperties")
private Map<String, String> dmiProperties;
+ private String requestId;
+ private String moduleSetTag;
/**
/**
- * Set DMI Properties by converting a list of
Persistence
CmHandle.Property objects.
+ * Set DMI Properties by converting a list of
YangModel
CmHandle.Property objects.
*
*
- * @param
dmiPropertiesAsList
list of cm handle dmi properties
+ * @param
yangModelCmHandleProperties
list of cm handle dmi properties
*/
public void asDmiProperties(
*/
public void asDmiProperties(
- final List<
PersistenceCmHandle.Property> dmiPropertiesAsList
) {
+ final List<
YangModelCmHandle.Property> yangModelCmHandleProperties
) {
dmiProperties = new LinkedHashMap<>();
dmiProperties = new LinkedHashMap<>();
- for (final
PersistenceCmHandle.Property dmiProperty : dmiPropertiesAsList
) {
+ for (final
YangModelCmHandle.Property dmiProperty : yangModelCmHandleProperties
) {
dmiProperties.put(dmiProperty.getName(), dmiProperty.getValue());
}
}
dmiProperties.put(dmiProperty.getName(), dmiProperty.getValue());
}
}