diff options
5 files changed, 104 insertions, 3 deletions
@@ -1,2 +1,3 @@ .idea .project +/bin/ diff --git a/ecomp-sdk/epsdk-fw/README.md b/ecomp-sdk/epsdk-fw/README.md index 1fe154f5..1aae8d69 100644 --- a/ecomp-sdk/epsdk-fw/README.md +++ b/ecomp-sdk/epsdk-fw/README.md @@ -29,6 +29,9 @@ nor does it require Spring. ### ONAP Distributions +Version 2.1.0 +- PORTAL-188 Framework Mode changes in SDK + Version 1.4.0 - PORTAL-19 Rename Java package base to org.onap - PORTAL-42 Use OParent as parent POM diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java index 732383b0..42dac01a 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java @@ -99,7 +99,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { EcompUser user = new EcompUser(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/ecompUser/" + loginId, null, + responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null, appName, null, username, password, true); logger.debug("responseString is: " + responseString); user = mapper.readValue(responseString, EcompUser.class); @@ -136,7 +136,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { List<EcompRole> rolesList = new ArrayList<>(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/ecompRoles", requestedLoginId, + responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/roles", requestedLoginId, appName, null, username, password, true); logger.debug("responseString is: " + responseString); rolesList = mapper.readValue(responseString, @@ -163,7 +163,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { EcompUser user = new EcompUser(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/ecompUser/" + loginId, null, + responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null, appName, null, username, password, true); logger.debug("responseString is: " + responseString); user = mapper.readValue(responseString, EcompUser.class); diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java index 5def2d43..f0447142 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java @@ -37,7 +37,10 @@ */ package org.onap.portalsdk.core.restful.domain; +import java.util.Set; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; /** * This bean holds the information for a role in the role and user management @@ -48,6 +51,16 @@ public class EcompRole implements Comparable<EcompRole> { protected Long id; private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Set roleFunctions; + + public Set getRoleFunctions() { + return roleFunctions; + } + + public void setRoleFunctions(Set roleFunctions) { + this.roleFunctions = roleFunctions; + } public Long getId() { return id; diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java new file mode 100644 index 00000000..6e108a02 --- /dev/null +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java @@ -0,0 +1,84 @@ +/* +* ============LICENSE_START========================================== +* ONAP Portal SDK +* =================================================================== +* Copyright © 2017 AT&T Intellectual Property. All rights reserved. +* =================================================================== +* +* Unless otherwise specified, all software contained herein is licensed +* under the Apache License, Version 2.0 (the "License"); +* you may not use this software 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. +* +* Unless otherwise specified, all documentation contained herein is licensed +* under the Creative Commons License, Attribution 4.0 Intl. (the "License"); +* you may not use this documentation except in compliance with the License. +* You may obtain a copy of the License at +* +* https://creativecommons.org/licenses/by/4.0/ +* +* Unless required by applicable law or agreed to in writing, documentation +* 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============================================ +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +*/ +package org.onap.portalsdk.core.restful.domain; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class EcompRoleFunction implements Comparable<EcompRoleFunction>{ + + private String name; + private String code; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String type; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String action; + + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public String getAction() { + return action; + } + public void setAction(String action) { + this.action = action; + } + @Override + public int compareTo(EcompRoleFunction arg0) { + return this.getCode().compareTo(arg0.getCode()); + } + +} + |