Skip to content

Commit 558bd19

Browse files
Gupta, SuryaGupta, Surya
authored andcommitted
CSTACKEX-31 Change the export policy endpoint path
1 parent 535289c commit 558bd19

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NASFeignClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ ExportPolicy createExportPolicy(URI uri, @RequestHeader("Authorization") String
6767
@RequestMapping(method = RequestMethod.GET)
6868
OntapResponse<ExportPolicy> getExportPolicyResponse(URI baseURL, @RequestHeader("Authorization") String header);
6969

70-
@RequestMapping(method = RequestMethod.GET, value="/id}")
70+
@RequestMapping(method = RequestMethod.GET, value="/{id}")
7171
OntapResponse<ExportPolicy> getExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id);
7272

73-
@RequestMapping(method = RequestMethod.DELETE, value="/id}")
73+
@RequestMapping(method = RequestMethod.DELETE, value="/{id}")
7474
void deleteExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id);
7575

76-
@RequestMapping(method = RequestMethod.PATCH, value="/id}")
76+
@RequestMapping(method = RequestMethod.PATCH, value="/{id}")
7777
OntapResponse<ExportPolicy> updateExportPolicy(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id,
7878
@RequestBody ExportPolicy request);
7979
}

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,6 @@ public static ProtocolsEnum fromValue(String text) {
7575
}
7676
return null;
7777
}
78-
79-
public static class Adapter extends TypeAdapter<ProtocolsEnum> {
80-
@Override
81-
public void write(final JsonWriter jsonWriter, final ProtocolsEnum enumeration) throws IOException {
82-
jsonWriter.value(enumeration.getValue());
83-
}
84-
85-
@Override
86-
public ProtocolsEnum read(final JsonReader jsonReader) throws IOException {
87-
String value = jsonReader.nextString();
88-
return ProtocolsEnum.fromValue(String.valueOf(value));
89-
}
90-
}
9178
}
9279

9380
@JsonProperty("protocols")
@@ -132,14 +119,6 @@ public ExportRule protocols(List<ProtocolsEnum> protocols) {
132119
return this;
133120
}
134121

135-
public ExportRule addProtocolsItem(ProtocolsEnum protocolsItem) {
136-
if (this.protocols == null) {
137-
this.protocols = new ArrayList<ProtocolsEnum>();
138-
}
139-
this.protocols.add(protocolsItem);
140-
return this;
141-
}
142-
143122
public List<ProtocolsEnum> getProtocols() {
144123
return protocols;
145124
}

0 commit comments

Comments
 (0)