/*
* ============LICENSE_START==========================================
* org.onap.music
* ===================================================================
* Copyright (c) 2017 AT&T Intellectual Property
* ===================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ============LICENSE_END=============================================
* ====================================================================
*/
package org.onap.music.response.jsonobjects;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus;
import org.onap.music.main.ResultType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "JsonResponse", description = "General Response JSON")
public class JsonResponse {
/* Status is required */
private ResultType status;
/* Standard informational fields */
private String error;
private String message;
/* versioning */
private String musicVersion;
private String musicBuild;
/* Data Fields */
private Map<String, HashMap<String, Object>> dataResult;
/* Locking fields */
private String lock;
private LockStatus lockStatus;
private List<String> lockHolders;
private String lockLease;
private boolean isLockHolders=false;
public boolean isLockHolders() {
return isLockHolders;
}
public JsonResponse setisLockHolders(boolean isLockHolders) {
this.isLockHolders = isLockHolders;
return this;
}
/**
* Create a JSONLock Response
* Use setters to provide more information as in
* JsonLockResponse(ResultType.SUCCESS).setMessage("We did it").setLock(mylockname)
* @param status
*/
public JsonResponse(ResultType status) {
this.status = status;
}
/**
*
* @return
*/
@ApiModelProperty(value = "Overall status of the response.",
allowableValues = "Success,Failure")
public ResultType getStatus() {
return status;
}
/**
*
* @param status
*/
public JsonResponse setStatus(ResultType status) {
this.status = status;
return this;
}
/**
*
* @return the error
*/
@ApiModelProperty(value = "Error value")
public String getError() {
return error;
}
/**
*
* @param error
*/
public JsonResponse setError(String error) {
this.error = error;
return this;
}
/**
*
* @return the message
*/
@ApiModelProperty(value = "Message value")
public String getMessage() {
return message;
}
/**
*
* @param message
*/
public JsonResponse setMessage(String message) {
this.message = message;
return this;
}
/**
* .
* @return the music version
*/
public String getMusicVersion() {
return this.musicVersion;
}
/**
* .
* @param version of music
* @return
*/
public JsonResponse setMusicVersion(String version) {
this3 | -8/+7 |
|
Currently APEX specific information is placed under properties|content in ToscaPolicy.
Avoid keeping under "content" and keep the information directly under properties.
Change-Id: Ic437271c9a2d71104013b5568af5525df4a4bb56
Issue-ID: POLICY-2332
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
|
|
This class was moved to policy-common some time ago. Removing it in
apex-pdp.
Issue-ID: POLICY-1913
Change-Id: I982fbd799334b34f1526e19f339236b52205b91e
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
This change brings in the minimum changes to get apex-pdp running in
Java 11. Other reviews will bring in changes to remove Java 11 warnings
and to convert apex-pdp Javascript handling from the now deprecated
nashorn engine.
Issue-ID: POLICY-1581
Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
The laest Eclipse checkstyle version 8.26.0 does more thorough checking
and identified a number of small issues in the apex-pdp codebase. This
review fixes those issues.
Issue-ID: POLICY-1913
Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Logging dialled back in logback.xml files and on ligging statements in
unit test java code.
Issue-ID: POLICY-2272
Change-Id: I3b9a46d8993b1571c8dc62687a9c136af46c1f51
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
The APPC implementation was changed in a recent review, this review
fixes the apex vcpe example to use this new model.
Also fixes an an issue in the CLI editor where escape characters are not
now required in example JSON.
Issue-ID: POLICY-2043
Change-Id: Id251948c9de27f73ba48cec498e68a43f71c4062
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Also added defaultbranch to the .gitreview file to make it easier
to change it when apex-pdp is branched in the future.
Issue-ID: POLICY-2045
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: Ib2570fd395aae38862299f2193b07ab06e32ace5
|
|
Issue-ID: POLICY-1965
Signed-off-by: jrh3 <jrh3@att.com>
Change-Id: Icd437f10c4d991030652ffa1abf48b7b5738145c
|
|
Currently apex CLIEditor is used to generate a json policy model from
apex CLI language (.apex) file.
As per the new LifeCycle API, the policies are expected to be defined
as ToscaServiceTemplate. Hence, the current CLIEditor is extended to
generate the policies in ToscaServiceTemplate way.
Change-Id: I2eb5d5b146643d40b623e329a2a63d6bb0c1fb42
Issue-ID: POLICY-1885
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
|
|
Issue-ID: POLICY-1897
Change-Id: I810c2550c6615d32b8d30148efc36a3660c3c1a5
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
policy model if it is empty. Implemented as a pair of JAXB XMLAdaters Updated copyright, fixed somecheckstyle issues, refactored affected tests & Merge"
|
|
policy model if it is empty. Implemented as a pair of JAXB XMLAdaters
Updated copyright, fixed somecheckstyle issues, refactored affected tests
& Merge
Issue-ID: POLICY-1802
Change-Id: Id68d9a524700f44c164939b7533f2d511b591e36
Signed-off-by: JohnKeeney <John.Keeney@est.tech>
|
|
Released 2.2.0
Issue-ID: POLICY-1737
Change-Id: I144a3c07d3eaf8c53d339eecedf2b3d8d3ce3c7e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
|
|
Copyright headers not changed as this review only amends comments.
Issue-ID: POLICY-1791
Change-Id: Icbeb2c6e591b3b160ae102bb67aef2d407924a4d
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Change-Id: Ifcd8866e65a7bc1238d5a4137f7bad288a5bfb3b
Issue-ID: POLICY-1861
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
|
|
Issue-ID: POLICY-1747
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iba1c6a80917a37cc63e2250a32df40046df9ee4f
|
|
Issue-ID: POLICY-1630
Change-Id: I6dfce7eb33d9bc41caabf6b8842377b486de672d
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Recent changes to increase code coverage and fox Sonar bugs have
introduced checkstyle and further Sonar issues. This review
cleans those up.
Issue-ID: POLICY-1523
Change-Id: I829217ef77d52e57f9713cfeee5b122e1f25efbc
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Change import line in all classes that use
the Assertions class, there are a lot of them.
Issue-ID: POLICY-1264
Change-Id: I8480264be4e36348b3fc63acf1bc36e9c9dd250b
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
Fix method has more than 7 parameters issues
Issue-ID: POLICY-1535
Change-Id: I12d995e323bbdbe3762c903fcb116dfe81bf7b54
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
|
|
Issue-ID: POLICY-1523
Change-Id: I24f9fe5811bb93597efe79c98572c5249e74026c
Signed-off-by: arindamm <arind.mondal@samsung.com>
|
|
Make test classes name consitence by adding 'Support' or 'Dummy' at start of util or dummy type of test classes
Issue-ID: POLICY-1263
Change-Id: I1dc1a7f174660a90664ebdcff2ea79ed30aa465c
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
|