diff options
Diffstat (limited to 'ecomp-sdk/epsdk-core')
94 files changed, 179 insertions, 8795 deletions
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index 1bdb1490..5d371e52 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <!-- GroupId is inherited from parent --> @@ -20,7 +21,7 @@ <properties> <drools.version>6.4.0.Final</drools.version> </properties> - + <!-- repositories are inherited from parent --> <build> @@ -42,13 +43,13 @@ </systemPropertyVariables> </configuration> </plugin> - + </plugins> </build> <dependencies> - <!-- internal --> + <!-- internal --> <dependency> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> @@ -61,6 +62,18 @@ </exclusions> </dependency> + <!-- internal --> + <dependency> + <groupId>org.onap.portal.sdk</groupId> + <artifactId>epsdk-domain</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- Drools --> <dependency> <groupId>org.drools</groupId> @@ -111,9 +124,9 @@ <version>${springframework.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${springframework.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${springframework.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -126,19 +139,19 @@ </exclusion> </exclusions> </dependency> - + <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.8.9</version> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.8.9</version> </dependency> - + <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> <version>1.8.9</version> </dependency> - + <!-- Hibernate --> <dependency> @@ -163,29 +176,29 @@ <version>2.3.1</version> </dependency> <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-spec</artifactId> - <version>1.2.5</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-spec</artifactId> + <version>1.2.5</version> </dependency> <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-impl</artifactId> - <version>1.2.5</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-impl</artifactId> + <version>1.2.5</version> </dependency> <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-spec</artifactId> - <version>1.2.5</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-spec</artifactId> + <version>1.2.5</version> </dependency> <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-impl</artifactId> - <version>1.2.5</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-impl</artifactId> + <version>1.2.5</version> </dependency> <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-jstlel</artifactId> - <version>1.2.5</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.5</version> </dependency> <!-- bridge to implement commons-logging using slf4j --> <dependency> @@ -337,37 +350,38 @@ </exclusion> </exclusions> </dependency> - + <dependency> - <groupId>com.att.eelf</groupId> - <artifactId>eelf-core</artifactId> - <version>1.0.0</version> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-core</artifactId> + <version>1.0.0</version> </dependency> <dependency> <groupId>org.owasp.esapi</groupId> <artifactId>esapi</artifactId> <version>2.1.0.1</version> - <exclusions> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> </exclusion> - <exclusion> - <groupId>org.beanshell</groupId> - <artifactId>bsh-core</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.beanshell</groupId> + <artifactId>bsh-core</artifactId> + </exclusion> + </exclusions> </dependency> + <!-- UEB was originally named Cambria --> <dependency> <groupId>com.att.nsa</groupId> @@ -400,14 +414,19 @@ <classifier>runtime</classifier> </dependency> <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.4.10</version> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queryparser</artifactId> + <version>7.2.1</version> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - <version>1.5.16</version> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.4.10</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + <version>1.5.16</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -425,9 +444,69 @@ <version>1.3.3</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.17</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>3.17</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <version>3.17</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-contrib</artifactId> + <version>3.5-FINAL</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -435,15 +514,10 @@ <version>4.5.3</version> </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.2</version> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.2</version> </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0.SP5</version> - </dependency> </dependencies> - + </project> diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/FusionObject.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/FusionObject.java deleted file mode 100644 index 17e20f54..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/FusionObject.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * ============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; - -/** - * <p> - * Title: FusionObject - * </p> - * - * <p> - * Description: This interface is implemented by all top-level support classes - * of each package in FUSION. This allows all top-level support classes to have - * some commonality for easier maintenance. - * </p> - */ -public interface FusionObject { - - /** - * Inner class provides static constants to any class that implements the - * interface. - */ - public class Parameters { - - private Parameters() { - // Static content only - } - - // HashMap parameters passed to the Service and Dao tiers - public static final String PARAM_USERID = "userId"; - public static final String PARAM_HTTP_REQUEST = "request"; - public static final String PARAM_FILTERS = "filters"; - public static final String PARAM_CLIENT_DEVICE = "client_device"; - // Request parameters passed in the Web tier - public static final String REQUEST_PARAM_DISPLAY_SUCCESS_MESSAGE = "display_success_message"; - } - - /** - * Inner class provides static utility functions to any class that implements - * the interface. - */ - public class Utilities { - - private Utilities() { - // Static content only - } - - /** - * nvl - replaces a string value with an empty string if null. - * - * @param s - * String - the string value that needs to be checked - * @return String - returns the original string value if not null. Otherwise an - * empty string ("") is returned. - */ - public static String nvl(String s) { - return s == null ? "" : s; - } - - /** - * nvl - replaces a string value with a default value if null or empty. - * - * @param s - * String - the string value that needs to be checked - * @param sDefault - * String - the default value - * @return String - returns the original string value if not null nor empty. - * Otherwise the default value is returned. - */ - public static String nvl(String s, String sDefault) { - return "".equals(nvl(s)) ? sDefault : s; - } - - /** - * Tests the specified string for nullity. - * - * @param a - * String to test for nullity. - * @return True if the specified string is null, empty or the 4-character - * sequence "null" (ignoring case); otherwise false. - */ - public static boolean isNull(String a) { - return a == null || a.length() == 0 || a.equalsIgnoreCase("null"); - } - - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java index dc6806a8..12f65ffd 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java @@ -215,4 +215,13 @@ public class LoginBean extends FusionCommand { this.userid = userid; } + @Override + public String toString() { + return "LoginBean [loginId=" + loginId + ", loginPwd=" + loginPwd + ", hrid=" + hrid + ", userid=" + userid + + ", siteAccess=" + siteAccess + ", loginErrorMessage=" + loginErrorMessage + ", user=" + user + + ", menu=" + menu + ", businessDirectMenu=" + businessDirectMenu + "]"; + } + + + } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java index b18cfc93..948498c4 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java @@ -41,6 +41,7 @@ import java.util.List; import org.onap.portalsdk.core.command.support.SearchBase; import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.domain.FusionObject.Utilities; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/support/FusionDao.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/support/FusionDao.java index 3ff2e47a..7966b720 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/support/FusionDao.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/support/FusionDao.java @@ -38,7 +38,7 @@ package org.onap.portalsdk.core.dao.support; import org.hibernate.SessionFactory; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; public class FusionDao implements FusionObject { private SessionFactory sessionFactory; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/App.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/App.java deleted file mode 100644 index 0fa94a10..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/App.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -/** - * Represents a row in the FN_APP table in the EP_SDK database. (A nearly - * identical table is defined in Portal database.) - * - * @version 1.0 - */ -public class App extends DomainVo { - - private static final long serialVersionUID = 3465979916929796990L; - - // superclass defines Id - private String name; // app_name - private String imageUrl; // app_image_url - private String description; // app_description - private String notes; // app_notes - private String url; // app_url - private String alternateUrl; // app_alternate_url - private String restEndpoint; // app_rest_endpoint - private String mlAppName; // ml_app_name - private String mlAppAdminId; // ml_app_admin_id - private String motsId; // mots_id - private String appPassword; // app_password - private String open; - private String enabled; - private byte[] thumbnail; - private String username; // app_username - private String uebKey; // ueb_key - private String uebSecret; // ueb_secret - private String uebTopicName; // ueb_topic_name - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAppPassword() { - return appPassword; - } - - public void setAppPassword(String appPassword) { - this.appPassword = appPassword; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getImageUrl() { - return imageUrl; - } - - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getAlternateUrl() { - return alternateUrl; - } - - public void setAlternateUrl(String alternateUrl) { - this.alternateUrl = alternateUrl; - } - - public String getRestEndpoint() { - return restEndpoint; - } - - public void setRestEndpoint(String restEndpoint) { - this.restEndpoint = restEndpoint; - } - - public String getMlAppName() { - return mlAppName; - } - - public void setMlAppName(String mlAppName) { - this.mlAppName = mlAppName; - } - - public String getMlAppAdminId() { - return mlAppAdminId; - } - - public void setMlAppAdminId(String mlAppAdminId) { - this.mlAppAdminId = mlAppAdminId; - } - - public String getMotsId() { - return motsId; - } - - public void setMotsId(String motsId) { - this.motsId = motsId; - } - - public String getOpen() { - return open; - } - - public void setOpen(String open) { - this.open = open; - } - - public String getEnabled() { - return enabled; - } - - public void setEnabled(String enabled) { - this.enabled = enabled; - } - - public byte[] getThumbnail() { - return this.thumbnail; - } - - public void setThumbnail(byte[] thumbnail) { - this.thumbnail = thumbnail; - } - - public String getUebKey() { - return uebKey; - } - - public void setUebKey(String uebKey) { - this.uebKey = uebKey; - } - - public String getUebSecret() { - return uebSecret; - } - - public void setUebSecret(String uebSecret) { - this.uebSecret = uebSecret; - } - - public String getUebTopicName() { - return uebTopicName; - } - - public void setUebTopicName(String uebTopicName) { - this.uebTopicName = uebTopicName; - } - - /** - * Answers true if the objects have the same ID. - */ - @Override - public int compareTo(Object obj) { - Long c1 = getId(); - Long c2 = ((App) obj).getId(); - return c1.compareTo(c2); - } -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/AuditLog.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/AuditLog.java deleted file mode 100644 index 2dbe28a3..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/AuditLog.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * ============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.domain; - -import java.util.Date; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -public class AuditLog extends DomainVo { - - /** - * - */ - private static final long serialVersionUID = 1L; - public static final String CD_ACTIVITY_LOGIN = "login"; - public static final String CD_ACTIVITY_LOGOUT = "logout"; - public static final String CD_ACTIVITY_MOBILE_LOGIN = "mobile_login"; - public static final String CD_ACTIVITY_MOBILE_LOGOUT = "mobile_logout"; - - /*-------Profile activities -----------*/ - public static final String CD_ACTIVITY_ROLE_ADD = "add_role"; - public static final String CD_ACTIVITY_ROLE_REMOVE = "remove_role"; - public static final String CD_ACTIVITY_CHILD_ROLE_ADD = "add_child_role"; - public static final String CD_ACTIVITY_CHILD_ROLE_REMOVE = "remove_child_role"; - public static final String CD_ACTIVITY_ROLE_ADD_FUNCTION = "add_role_function"; - public static final String CD_ACTIVITY_ROLE_REMOVE_FUNCTION = "remove_role_function"; - public static final String CD_ACTIVITY_USER_ROLE_ADD = "add_user_role"; - public static final String CD_ACTIVITY_USER_ROLE_REMOVE = "remove_user_role"; - - /* Audit activities */ - public static final String CD_ACTIVITY_FUNCTIONAL_ACCESS = "functional_access"; - public static final String CD_ACTIVITY_TAB_ACCESS = "tab_access"; - public static final String CD_ACTIVITY_APP_ACCESS = "app_access"; - public static final String CD_ACTIVITY_LEFT_MENU_ACCESS = "left_menu_access"; - - private String activityCode; - private String affectedRecordId; - private String comments; - private Date auditDate; - private Long userId; - - public AuditLog() { - setCreated(new Date()); - } - - public AuditLog(String activityCode, String affectedRecordId, String comments, Long userId){ - this.activityCode = activityCode; - this.affectedRecordId = affectedRecordId; - this.comments = comments; - this.userId = userId; - setCreated(new Date()); - } - public String getActivityCode() { - return activityCode; - } - - public String getComments() { - return comments; - } - - public String getAffectedRecordId() { - return affectedRecordId; - } - - public void setActivityCode(String activityCode) { - this.activityCode = activityCode; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public void setAffectedRecordId(String affectedRecordId) { - this.affectedRecordId = affectedRecordId; - } - - public Date getAuditDate() { - return auditDate; - } - - public void setAuditDate(Date auditDate) { - this.auditDate = auditDate; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/BroadcastMessage.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/BroadcastMessage.java deleted file mode 100644 index 01d6caed..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/BroadcastMessage.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * ============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.domain; - -import java.util.Date; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -public class BroadcastMessage extends DomainVo { - - private static final long serialVersionUID = 1L; - - public static final String ID_MESSAGE_LOCATION_LOGIN = "10"; - public static final String ID_MESSAGE_LOCATION_WELCOME = "20"; - - private String messageText; - private Integer locationId; - private Date startDate; - private Date endDate; - private Integer sortOrder; - private Boolean active; - private String siteCd; - - public Boolean getActive() { - return active; - } - - public Date getEndDate() { - return endDate; - } - - public Integer getLocationId() { - return locationId; - } - - public String getMessageText() { - return messageText; - } - - public Integer getSortOrder() { - return sortOrder; - } - - public Date getStartDate() { - return startDate; - } - - public String getSiteCd() { - return siteCd; - } - - public void setActive(Boolean active) { - this.active = active; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public void setLocationId(Integer locationId) { - this.locationId = locationId; - } - - public void setMessageText(String messageText) { - this.messageText = messageText; - } - - public void setSortOrder(Integer sortOrder) { - this.sortOrder = sortOrder; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public void setSiteCd(String siteCd) { - this.siteCd = siteCd; - } - - @Override - public int compareTo(Object obj) { - Integer c1 = getLocationId(); - Integer c2 = ((BroadcastMessage) obj).getLocationId(); - - if (c1.compareTo(c2) == 0) { - c1 = getSortOrder(); - c2 = ((BroadcastMessage) obj).getSortOrder(); - - if (c1.compareTo(c2) == 0) { - Long c3 = getId(); - Long c4 = ((BroadcastMessage) obj).getId(); - - return c3.compareTo(c4); - } - } - - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/DomainVo.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/DomainVo.java deleted file mode 100644 index 2818bf04..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/DomainVo.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * ============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.domain; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - -/* Super class from which all data objects descend - * - * @deprecated per Sunder T on 3 June 2016: - * - * Yes, we need to get rid of domain.DomainVO and fold all the references to the support.DomainVO. - */ -@SuppressWarnings("rawtypes") -@Deprecated -public class DomainVo extends FusionVo implements Serializable, Cloneable, Comparable { - - private static final long serialVersionUID = 1L; - protected Long id; - protected Date created; - protected Date modified; - protected Long createdId; - protected Long modifiedId; - protected Long rowNum; - - protected Serializable auditUserId; - - Set auditTrail = null; - - public void setId(Long i) { - id = i; - } - - public void setCreated(Date created) { - this.created = created; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public void setCreatedId(Long createdId) { - this.createdId = createdId; - } - - public void setModifiedId(Long modifiedId) { - this.modifiedId = modifiedId; - } - - public void setAuditUserId(Serializable auditUserId) { - this.auditUserId = auditUserId; - } - - public void setRowNum(Long rowNum) { - this.rowNum = rowNum; - } - - public void setAuditTrail(Set auditTrail) { - this.auditTrail = auditTrail; - } - - public Long getId() { - return id; - } - - public Date getCreated() { - return created; - } - - public Date getModified() { - return modified; - } - - public Long getCreatedId() { - return createdId; - } - - public Long getModifiedId() { - return modifiedId; - } - - public Serializable getAuditUserId() { - return auditUserId; - } - - public Long getRowNum() { - return rowNum; - } - - public Set getAuditTrail() { - return auditTrail; - } - - @SuppressWarnings("unchecked") - public void addAuditTrailLog(AuditLog auditLog) { - if (getAuditTrail() == null) { - setAuditTrail(new HashSet()); - } - - getAuditTrail().add(auditLog); - } - - public Object copy() { - return copy(false); - } - - public Object copy(boolean isIdNull) { - // let's create a "copy" of the object using serialization - ByteArrayOutputStream baos = null; - ByteArrayInputStream bais = null; - ObjectOutputStream oos = null; - ObjectInputStream ois = null; - - DomainVo newVo = null; - - try { - - baos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(baos); - oos.writeObject(this); - - bais = new ByteArrayInputStream(baos.toByteArray()); - ois = new ObjectInputStream(bais); - newVo = (DomainVo) ois.readObject(); - - if (isIdNull) { - newVo.setId(null); - } - - } catch (Exception e) { - e.printStackTrace(); - } - - return newVo; - } - - @Override - public int compareTo(Object obj) { - Long c1 = getId(); - Long c2 = ((DomainVo) obj).getId(); - - return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FnMenu.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FnMenu.java deleted file mode 100644 index 894c35f1..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FnMenu.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -/** - * <p> - * RoleFunction.java - * </p> - * - * <p> - * Represents a role function data object. - * </p> - * - * @version 1.0 - */ -public class FnMenu extends DomainVo { - - private static final long serialVersionUID = 1L; - - private Integer menuId; - private String label; - private Integer parentId; - private String action; - private String functionCd; - private Integer sortOrder; - private String servlet; - private String queryString; - private String externalUrl; - private String target; - private String active; - private String separator; - private String imageSrc; - private String menuSetCode; - - public Integer getMenuId() { - return menuId; - } - - public void setMenuId(Integer menuId) { - this.menuId = menuId; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public Integer getParentId() { - return parentId; - } - - public void setParentId(Integer parentId) { - this.parentId = parentId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getFunctionCd() { - return functionCd; - } - - public void setFunctionCd(String functionCd) { - this.functionCd = functionCd; - } - - public Integer getSortOrder() { - return sortOrder; - } - - public void setSortOrder(Integer sortOrder) { - this.sortOrder = sortOrder; - } - - public String getServlet() { - return servlet; - } - - public void setServlet(String servlet) { - this.servlet = servlet; - } - - public String getQueryString() { - return queryString; - } - - public void setQueryString(String queryString) { - this.queryString = queryString; - } - - public String getExternalUrl() { - return externalUrl; - } - - public void setExternalUrl(String externalUrl) { - this.externalUrl = externalUrl; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getSeparator() { - return separator; - } - - public void setSeparator(String separator) { - this.separator = separator; - } - - public String getImageSrc() { - return imageSrc; - } - - public void setImageSrc(String imageSrc) { - this.imageSrc = imageSrc; - } - - public String getMenuSetCode() { - return menuSetCode; - } - - public void setMenuSetCode(String menuSetCode) { - this.menuSetCode = menuSetCode; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FusionVo.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FusionVo.java deleted file mode 100644 index ac25ae10..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/FusionVo.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.FusionObject; - -public class FusionVo implements FusionObject { - public FusionVo() { - // No-argument constructor - } -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LoginBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LoginBean.java deleted file mode 100644 index f6675a01..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LoginBean.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * ============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.domain; - -import java.util.Set; - -import org.onap.portalsdk.core.domain.support.FusionCommand; - -@SuppressWarnings("rawtypes") -public class LoginBean extends FusionCommand { - - private String loginId; - private String loginPwd; - private String hrid; - private String orgUserId; - private String siteAccess; - private String loginErrorMessage; - - private User user; - private Set menu; - private Set businessDirectMenu; - - /** - * getLoginId - * - * @return String - */ - public String getLoginId() { - return loginId; - } - - /** - * getLoginPwd - * - * @return String - */ - public String getLoginPwd() { - return loginPwd; - } - - /** - * getMenu - * - * @return Set - */ - public Set getMenu() { - return menu; - } - - /** - * getUser - * - * @return User - */ - public User getUser() { - return user; - } - - /** - * getHrid - * - * @return String - */ - public String getHrid() { - return hrid; - } - - /** - * getSiteAccess - * - * @return String - */ - public String getSiteAccess() { - return siteAccess; - } - - /** - * getBusinessDirectMenu - * - * @return Set - */ - public Set getBusinessDirectMenu() { - return businessDirectMenu; - } - - /** - * getLoginErrorMessage - * - * @return String - */ - public String getLoginErrorMessage() { - return loginErrorMessage; - } - - public String getOrgUserId() { - return orgUserId; - } - - /** - * setLoginId - * - * @param loginId - * String - */ - public void setLoginId(String loginId) { - this.loginId = loginId; - } - - /** - * setLoginPwd - * - * @param loginPwd - * String - */ - public void setLoginPwd(String loginPwd) { - this.loginPwd = loginPwd; - } - - public void setMenu(Set menu) { - this.menu = menu; - } - - /** - * setUser - * - * @param user - * User - */ - public void setUser(User user) { - this.user = user; - } - - /** - * setHrid - * - * @param hrid - * String - */ - public void setHrid(String hrid) { - this.hrid = hrid; - } - - /** - * setSiteAccess - * - * @param siteAccess - * String - */ - public void setSiteAccess(String siteAccess) { - this.siteAccess = siteAccess; - } - - /** - * setBusinessDirectMenu - * - * @param businessDirectMenu - * Set - */ - public void setBusinessDirectMenu(Set businessDirectMenu) { - this.businessDirectMenu = businessDirectMenu; - } - - /** - * setLoginErrorMessage - * - * @param loginErrorMessage - * String - */ - public void setLoginErrorMessage(String loginErrorMessage) { - this.loginErrorMessage = loginErrorMessage; - } - - public void setOrgUserId(String orgUserId) { - this.orgUserId = orgUserId; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Lookup.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Lookup.java deleted file mode 100644 index cf7163ca..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Lookup.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * ============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.domain; - -import java.io.Serializable; -import java.util.Objects; - -import org.onap.portalsdk.core.domain.support.NameValueId; - -public class Lookup extends FusionVo implements Serializable { - - private static final long serialVersionUID = 1L; - private NameValueId nameValueId = new NameValueId(); - - public Lookup() { - super(); - } - - public Lookup(String label, String value) { - this(); - setLabel(label); - setValue(value); - } - - public String getValue() { - return getNameValueId().getVal(); - } - - public String getLabel() { - return getNameValueId().getLab(); - } - - public void setValue(String value) { - getNameValueId().setVal(value); - } - - public void setLabel(String label) { - getNameValueId().setLab(label); - } - - public NameValueId getNameValueId() { - return nameValueId; - } - - public void setNameValueId(NameValueId nameValueId) { - this.nameValueId = nameValueId; - } - - // required by ZK for to set the selectedItems of Listboxes (used heavily for - // <select>-style drop-downs) - @Override - public int hashCode() { - return Objects.hash(getValue(), getLabel()); - } - - @Override - public boolean equals(Object obj) { - if (obj == null || !(obj instanceof Lookup)) - return false; - Lookup lookup = (Lookup) obj; - return Objects.equals(lookup.getValue(), getValue()) && Objects.equals(lookup.getLabel(), getLabel()); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuCountry.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuCountry.java deleted file mode 100644 index c3f1c6ed..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuCountry.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * ============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.domain; - -/** - * - * <p> - * Represents a country data object. - * </p> - * - * @version 1.0 - */ -public class LuCountry extends DomainVo { - - private static final long serialVersionUID = 1L; - private String abbr; - private String country; - private String fullName; - private String webphoneCountryLabel; - - public String getCountry() { - return country; - } - - public String getAbbr() { - return abbr; - } - - public void setCountry(String country) { - this.country = country; - } - - public void setAbbr(String abbr) { - this.abbr = abbr; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getWebphoneCountryLabel() { - return webphoneCountryLabel; - } - - public void setWebphoneCountryLabel(String webphoneCountryLabel) { - this.webphoneCountryLabel = webphoneCountryLabel; - } - - @Override - public int compareTo(Object obj) { - String c1 = getCountry(); - String c2 = ((LuCountry) obj).getCountry(); - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuState.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuState.java deleted file mode 100644 index d82eab65..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuState.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * ============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.domain; - -/** - * <p> - * Represents a state data object. - * </p> - * - * @version 1.0 - */ -public class LuState extends DomainVo { - - private static final long serialVersionUID = 1L; - - private String abbr; - private String state; - - public String getState() { - return state; - } - - public String getAbbr() { - return abbr; - } - - public void setState(String state) { - this.state = state; - } - - public void setAbbr(String abbr) { - this.abbr = abbr; - } - - @Override - public int compareTo(Object obj) { - String c1 = getState(); - String c2 = ((LuState) obj).getState(); - - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuTimeZone.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuTimeZone.java deleted file mode 100644 index f1494627..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/LuTimeZone.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * ============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.domain; - -/** - * <p> - * LuTimeZone.java - * </p> - * - * <p> - * Represents a LuTimeZone data object. - * </p> - * - * @version 1.0 - */ -public class LuTimeZone extends DomainVo { - - private static final long serialVersionUID = 1L; - private String name; - private Long timezoneId; - private String value; - - public String getName() { - return name; - } - - public String getValue() { - return value; - } - - public void setName(String name) { - this.name = name; - } - - public void setValue(String value) { - this.value = value; - } - - public Long getTimezoneId() { - return timezoneId; - } - - public void setTimezoneId(Long timezoneId) { - this.timezoneId = timezoneId; - } - - @Override - public int compareTo(Object obj) { - Long c1 = getId(); - Long c2 = ((LuTimeZone) obj).getId(); - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Menu.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Menu.java deleted file mode 100644 index a13f17a4..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Menu.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -public class Menu extends DomainVo { - - private static final long serialVersionUID = 1L; - - private String menuLevel; - private String label; - private Long parentId; - private String action; - private String functionCd; - private Short sortOrder; - private String servlet; - private String queryString; - private String externalUrl; - private String target; - private boolean active; - private String menuSetCode; - private boolean separator; - private String imageSrc; - - public String getAction() { - return action; - } - - public boolean isActive() { - return active; - } - - public String getExternalUrl() { - return externalUrl; - } - - public String getFunctionCd() { - return functionCd; - } - - public String getLabel() { - return label; - } - - public String getMenuLevel() { - return menuLevel; - } - - public Long getParentId() { - return parentId; - } - - public String getQueryString() { - return queryString; - } - - public String getServlet() { - return servlet; - } - - public Short getSortOrder() { - return sortOrder; - } - - public String getTarget() { - return target; - } - - public String getMenuSetCode() { - return menuSetCode; - } - - public void setAction(String action) { - this.action = action; - } - - public void setActive(boolean active) { - this.active = active; - } - - public void setExternalUrl(String externalUrl) { - this.externalUrl = externalUrl; - } - - public void setFunctionCd(String functionCd) { - this.functionCd = functionCd; - } - - public void setLabel(String label) { - this.label = label; - } - - public void setMenuLevel(String menuLevel) { - this.menuLevel = menuLevel; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - public void setQueryString(String queryString) { - this.queryString = queryString; - } - - public void setServlet(String servlet) { - this.servlet = servlet; - } - - public void setSortOrder(Short sortOrder) { - this.sortOrder = sortOrder; - } - - public void setTarget(String target) { - this.target = target; - } - - public void setMenuSetCode(String menuSetCode) { - this.menuSetCode = menuSetCode; - } - - public boolean isSeparator() { - return separator; - } - - public void setSeparator(boolean separator) { - this.separator = separator; - } - - public String getImageSrc() { - return imageSrc; - } - - public void setImageSrc(String imageSrc) { - this.imageSrc = imageSrc; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/MenuData.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/MenuData.java deleted file mode 100644 index be8264a6..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/MenuData.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * ============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.domain; - -import java.util.Set; -import java.util.TreeSet; - -public class MenuData extends Menu { - - private static final long serialVersionUID = 1L; - private MenuData parentMenu; - private Set childMenus = new TreeSet(); - - public MenuData() { - } - - public Set getChildMenus() { - return childMenus; - } - - public void setChildMenus(Set childMenus) { - this.childMenus = childMenus; - } - - public MenuData getParentMenu() { - return parentMenu; - } - - public void setParentMenu(MenuData parentMenu) { - this.parentMenu = parentMenu; - } - - public String getActiveAsString() { - return String.valueOf(isActive()); - } - - public String getParentIdAsString() { - return String.valueOf(getParentId()); - } - - public String getSeparatorAsString() { - return String.valueOf(isSeparator()); - } - - @Override - public int compareTo(Object obj) { - Short c1 = getSortOrder(); - Short c2 = ((MenuData) obj).getSortOrder(); - return (c1 == null || c2 == null) ? 1 : ((c1.compareTo(c2) == 0) ? 1 : c1.compareTo(c2)); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Profile.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Profile.java deleted file mode 100644 index 9df131de..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Profile.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -public class Profile extends DomainVo { - - private static final long serialVersionUID = 3409056457412656883L; - - private Long id; - private String first_name; - private String last_name; - private String email; - private String orgManagerUserId; - private String active_yn; - private String orgUserId; - - @Override - public Long getId() { - return id; - } - - @Override - public void setId(Long id) { - this.id = id; - } - - public String getFirst_name() { - return first_name; - } - - public void setFirst_name(String first_name) { - this.first_name = first_name; - } - - public String getLast_name() { - return last_name; - } - - public void setLast_name(String last_name) { - this.last_name = last_name; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getOrgManagerUserId() { - return orgManagerUserId; - } - - public void setOrgManagerUserId(String orgManagerUserId) { - this.orgManagerUserId = orgManagerUserId; - } - - public String getActive_yn() { - return active_yn; - } - - public void setActive_yn(String active_yn) { - this.active_yn = active_yn; - } - - public String getOrgUserId() { - return orgUserId; - } - - public void setOrgUserId(String orgUserId) { - this.orgUserId = orgUserId; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Role.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Role.java deleted file mode 100644 index 2d772943..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/Role.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * ============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.domain; - -import java.util.Iterator; -import java.util.Set; -import java.util.TreeSet; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -/** - * <p> - * Role.java - * </p> - * <p> - * Represents a role data object. - * </p> - * - * @version 1.0 - */ -public class Role extends DomainVo { - - private static final long serialVersionUID = 1L; - private String name; - private boolean active; - private Integer priority; - - private Set roleFunctions = new TreeSet(); - private Set childRoles = new TreeSet(); - @JsonIgnore - private Set parentRoles = new TreeSet(); - - public String getName() { - return name; - } - - public boolean getActive() { - return active; - } - - public Set getRoleFunctions() { - return roleFunctions; - } - - public Integer getPriority() { - return priority; - } - - public Set getChildRoles() { - return childRoles; - } - - public Set getParentRoles() { - return parentRoles; - } - - public void setName(String name) { - this.name = name; - } - - public void setActive(boolean active) { - this.active = active; - } - - public void setRoleFunctions(Set roleFunctions) { - this.roleFunctions = roleFunctions; - } - - public void setPriority(Integer priority) { - this.priority = priority; - } - - public void setChildRoles(Set childRoles) { - this.childRoles = childRoles; - } - - public void setParentRoles(Set parentRoles) { - this.parentRoles = parentRoles; - } - - @SuppressWarnings("unchecked") - public void addRoleFunction(RoleFunction roleFunction) { - this.roleFunctions.add(roleFunction); - } - - @SuppressWarnings("unchecked") - public void addChildRole(Role role) { - this.childRoles.add(role); - } - - @SuppressWarnings("unchecked") - public void addParentRole(Role role) { - this.parentRoles.add(role); - } - - public String getEditUrl() { - return "/role.htm?role_id=" + getId(); - } - - public String getToggleActiveImage() { - return "/static/fusion/images/" + (getActive() ? "active.png" : "inactive.png"); - } - - public String getToggleActiveAltText() { - return getActive() ? "Click to Deactivate Role" : "Click to Activate Role"; - } - - public void removeChildRole(Long roleId) { - Iterator i = this.childRoles.iterator(); - while (i.hasNext()) { - Role childRole = (Role) i.next(); - if (childRole.getId().equals(roleId)) { - this.childRoles.remove(childRole); - break; - } - } - } - - public void removeParentRole(Long roleId) { - Iterator i = this.parentRoles.iterator(); - while (i.hasNext()) { - Role parentRole = (Role) i.next(); - if (parentRole.getId().equals(roleId)) { - this.parentRoles.remove(parentRole); - break; - } - } - } - - public void removeRoleFunction(String roleFunctionCd) { - Iterator i = this.roleFunctions.iterator(); - while (i.hasNext()) { - RoleFunction roleFunction = (RoleFunction) i.next(); - if (roleFunction.getCode().equals(roleFunctionCd)) { - this.roleFunctions.remove(roleFunction); - break; - } - } - } - - @Override - public int compareTo(Object obj) { - String c1 = getName(); - String c2 = ((Role) obj).getName(); - return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/RoleFunction.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/RoleFunction.java deleted file mode 100644 index 678f95b6..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/RoleFunction.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * ============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.domain; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - -/** - * <p> - * RoleFunction.java - * </p> - * - * <p> - * Represents a role function data object. - * </p> - * - * @version 1.0 - */ -public class RoleFunction extends DomainVo { - - private static final long serialVersionUID = 1L; - private String code; - private String name; - private String type; - private String action; - - 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; - } - - public String getName() { - return name; - } - - public String getCode() { - return code; - } - - public void setName(String name) { - this.name = name; - } - - public void setCode(String code) { - this.code = code; - } - - @JsonIgnore - public String getEditUrl() { - return "/role_function.htm?role_function_id=" + getCode(); - } - - @Override - public int compareTo(Object obj) { - String c1 = getName(); - String c2 = ((RoleFunction) obj).getName(); - return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessible.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessible.java deleted file mode 100644 index 55fe3624..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessible.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * ============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.domain; - -import java.io.Serializable; -import java.util.Objects; - -public class UrlsAccessible extends FusionVo implements Serializable { - - private static final long serialVersionUID = 1L; - private UrlsAccessibleKey urlsAccessibleKey = new UrlsAccessibleKey(); - - public UrlsAccessible() { - super(); - } - - public UrlsAccessible(String url, String functionCd) { - this(); - setUrl(url); - setFunctionCd(functionCd); - } - - public String getUrl() { - return getUrlsAccessibleKey().getUrl(); - } - - public String getFunctionCd() { - return getUrlsAccessibleKey().getFunctionCd(); - } - - public void setUrl(String url) { - getUrlsAccessibleKey().setUrl(url); - } - - public void setFunctionCd(String functionCd) { - getUrlsAccessibleKey().setFunctionCd(functionCd); - } - - public UrlsAccessibleKey getUrlsAccessibleKey() { - return urlsAccessibleKey; - } - - public void setUrlsAccessibleKey(UrlsAccessibleKey urlsAccessibleKey) { - this.urlsAccessibleKey = urlsAccessibleKey; - } - - @Override - public int hashCode() { - return Objects.hash(getUrl(), getFunctionCd()); - } - - @Override - public boolean equals(Object obj) { - if (obj == null || !(obj instanceof UrlsAccessible)) - return false; - UrlsAccessible ua = (UrlsAccessible) obj; - return Objects.equals(ua.getUrl(), getUrl()) && Objects.equals(ua.getFunctionCd(), getFunctionCd()); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessibleKey.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessibleKey.java deleted file mode 100644 index 59732b27..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UrlsAccessibleKey.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * ============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.domain; - -import java.io.Serializable; - -public class UrlsAccessibleKey implements Serializable { - - private static final long serialVersionUID = 1L; - private String url; - private String functionCd; - - public UrlsAccessibleKey() { - super(); - } - - public UrlsAccessibleKey(String url, String functionCd) { - setUrl(url); - setFunctionCd(functionCd); - } - - public String getUrl() { - return url; - } - - public String getFunctionCd() { - return functionCd; - } - - public void setUrl(String url) { - this.url = url; - } - - public void setFunctionCd(String functionCd) { - this.functionCd = functionCd; - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null) - return false; - if (!(o instanceof UrlsAccessibleKey)) - return false; - final UrlsAccessibleKey key = (UrlsAccessibleKey) o; - if (getFunctionCd().equals(key.getFunctionCd()) && getUrl().equals(key.getUrl())) - return true; - - return false; - } - - @Override - public int hashCode() { - return getUrl().hashCode() + getFunctionCd().hashCode(); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/User.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/User.java deleted file mode 100644 index 6d823817..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/User.java +++ /dev/null @@ -1,594 +0,0 @@ -/* - * ============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.domain; - -import java.util.Date; -import java.util.Iterator; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.onap.portalsdk.core.domain.support.DomainVo; - -/** - * <p> - * User.java - * </p> - * - * <p> - * Represents a user data object. - * </p> - * - * @version 1.0 - */ -public class User extends DomainVo { - - private static final long serialVersionUID = 1L; - private Long orgId; - private Long managerId; - private String firstName; - private String middleInitial; - private String lastName; - private String phone; - private String fax; - private String cellular; - private String email; - private Long addressId; - private String alertMethodCd; - private String hrid; - private String orgUserId; - private String orgCode; - private String address1; - private String address2; - private String city; - private String state; - private String zipCode; - private String country; - private String orgManagerUserId; - private String locationClli; - private String businessCountryCode; - private String businessCountryName; - private String businessUnit; - private String businessUnitName; - private String department; - private String departmentName; - private String companyCode; - private String company; - private String zipCodeSuffix; - private String jobTitle; - private String commandChain; - private String siloStatus; - private String costCenter; - private String financialLocCode; - - private String loginId; - private String loginPwd; - private Date lastLoginDate; - private boolean active; - private boolean internal; - private Long selectedProfileId; - private Long timeZoneId; - private boolean online; - private String chatId; - - private Set userApps = new TreeSet(); - - private Set pseudoRoles = new TreeSet(); - - public Long getAddressId() { - return addressId; - } - - public String getAlertMethodCd() { - return alertMethodCd; - } - - public String getCellular() { - return cellular; - } - - public String getEmail() { - return email; - } - - public String getFax() { - return fax; - } - - public String getFirstName() { - return firstName; - } - - public String getHrid() { - return hrid; - } - - public Date getLastLoginDate() { - return lastLoginDate; - } - - public String getLastName() { - return lastName; - } - - public String getFullName() { - return getFirstName() + " " + getLastName(); - } - - public String getLoginId() { - return loginId; - } - - public String getLoginPwd() { - return loginPwd; - } - - public Long getManagerId() { - return managerId; - } - - public String getMiddleInitial() { - return middleInitial; - } - - public String getOrgCode() { - return orgCode; - } - - public Long getOrgId() { - return orgId; - } - - public String getPhone() { - return phone; - } - - public String getOrgUserId() { - return orgUserId; - } - - public boolean getActive() { - return active; - } - - public boolean getInternal() { - return internal; - } - - public String getAddress1() { - return address1; - } - - public String getAddress2() { - return address2; - } - - public String getCity() { - return city; - } - - public String getCountry() { - return country; - } - - public String getState() { - return state; - } - - public String getZipCode() { - return zipCode; - } - - public String getBusinessCountryCode() { - return businessCountryCode; - } - - public String getCommandChain() { - return commandChain; - } - - public String getCompany() { - return company; - } - - public String getCompanyCode() { - return companyCode; - } - - public String getDepartment() { - return department; - } - - public String getJobTitle() { - return jobTitle; - } - - public String getLocationClli() { - return locationClli; - } - - public String getOrgManagerUserId() { - return orgManagerUserId; - } - - public String getZipCodeSuffix() { - return zipCodeSuffix; - } - - public String getBusinessCountryName() { - return businessCountryName; - } - - public Set getPseudoRoles() { - return pseudoRoles; - } - - public Long getSelectedProfileId() { - return selectedProfileId; - } - - public void setAddressId(Long addressId) { - this.addressId = addressId; - } - - public void setAlertMethodCd(String alertMethodCd) { - this.alertMethodCd = alertMethodCd; - } - - public void setCellular(String cellular) { - this.cellular = cellular; - } - - public void setEmail(String email) { - this.email = email; - } - - public void setFax(String fax) { - this.fax = fax; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public void setHrid(String hrid) { - this.hrid = hrid; - } - - public void setLastLoginDate(Date lastLoginDate) { - this.lastLoginDate = lastLoginDate; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public void setLoginId(String loginId) { - this.loginId = loginId; - } - - public void setLoginPwd(String loginPwd) { - this.loginPwd = loginPwd; - } - - public void setManagerId(Long managerId) { - this.managerId = managerId; - } - - public void setMiddleInitial(String middleInitial) { - this.middleInitial = middleInitial; - } - - public void setOrgCode(String orgCode) { - this.orgCode = orgCode; - } - - public void setOrgId(Long orgId) { - this.orgId = orgId; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public void setOrgUserId(String orgUserId) { - this.orgUserId = orgUserId; - } - - public void setActive(boolean active) { - this.active = active; - } - - public void setInternal(boolean internal) { - this.internal = internal; - } - - public void setAddress1(String address1) { - this.address1 = address1; - } - - public void setAddress2(String address2) { - this.address2 = address2; - } - - public void setCity(String city) { - this.city = city; - } - - public void setCountry(String country) { - this.country = country; - } - - public void setState(String state) { - this.state = state; - } - - public void setZipCode(String zipCode) { - this.zipCode = zipCode; - } - - public void setBusinessCountryCode(String businessCountryCode) { - this.businessCountryCode = businessCountryCode; - } - - public void setCommandChain(String commandChain) { - this.commandChain = commandChain; - } - - public void setCompany(String company) { - this.company = company; - } - - public void setCompanyCode(String companyCode) { - this.companyCode = companyCode; - } - - public void setDepartment(String department) { - this.department = department; - } - - public void setJobTitle(String jobTitle) { - this.jobTitle = jobTitle; - } - - public void setLocationClli(String locationClli) { - this.locationClli = locationClli; - } - - public void setOrgManagerUserId(String orgManagerUserId) { - this.orgManagerUserId = orgManagerUserId; - } - - public void setZipCodeSuffix(String zipCodeSuffix) { - this.zipCodeSuffix = zipCodeSuffix; - } - - public void setBusinessCountryName(String businessCountryName) { - this.businessCountryName = businessCountryName; - } - - public void setPseudoRoles(Set pseudoRoles) { - this.pseudoRoles = pseudoRoles; - } - - public void setSelectedProfileId(Long selectedProfileId) { - this.selectedProfileId = selectedProfileId; - } - - public Long getTimeZoneId() { - return timeZoneId; - } - - public void setTimeZoneId(Long timeZoneId) { - this.timeZoneId = timeZoneId; - } - - public String getBusinessUnit() { - return businessUnit; - } - - public void setBusinessUnit(String businessUnit) { - this.businessUnit = businessUnit; - } - - public String getSiloStatus() { - return siloStatus; - } - - public void setSiloStatus(String siloStatus) { - this.siloStatus = siloStatus; - } - - public String getCostCenter() { - return costCenter; - } - - public void setCostCenter(String costCenter) { - this.costCenter = costCenter; - } - - public String getFinancialLocCode() { - return financialLocCode; - } - - public void setFinancialLocCode(String financialLocCode) { - this.financialLocCode = financialLocCode; - } - - public String getBusinessUnitName() { - return businessUnitName; - } - - public void setBusinessUnitName(String businessUnitName) { - this.businessUnitName = businessUnitName; - } - - public String getDepartmentName() { - return departmentName; - } - - public void setDepartmentName(String departmentName) { - this.departmentName = departmentName; - } - - public boolean isOnline() { - return online; - } - - public void setOnline(boolean online) { - this.online = online; - } - - public String getChatId() { - return chatId; - } - - public void setChatId(String chatId) { - this.chatId = chatId; - } - - public Set getUserApps() { - return userApps; - } - - public void setUserApps(Set userApps) { - this.userApps = userApps; - } - - @SuppressWarnings("unchecked") - public void addAppRoles(App app, SortedSet<Role> roles) { - if (roles != null) { - // add all - Set newUserApps = new TreeSet(); - Iterator itr = roles.iterator(); - while (itr.hasNext()) { - Role role = (Role) itr.next(); - UserApp userApp = new UserApp(); - userApp.setUserId(this.id); - userApp.setApp(app); - userApp.setRole(role); - newUserApps.add(userApp); - } - setUserApps(newUserApps); - } else { - // remove all - this.userApps.clear(); - } - - } - - @SuppressWarnings("unchecked") - public SortedSet<Role> getAppRoles(App app) { - SortedSet<Role> roles = new TreeSet(); - Set apps = getUserApps(); - Iterator appsItr = apps.iterator(); - // getting default app - while (appsItr.hasNext()) { - UserApp tempUserApp = (UserApp) appsItr.next(); - if (tempUserApp.getApp().getId().equals(app.getId())) { - roles.add(tempUserApp.getRole()); - } - } - return roles; - } - - public SortedSet<Role> getRoles() { - App app = new App(); - app.setId(new Long(1)); - app.setName("Default"); - return getAppRoles(app); - } - - public UserApp getDefaultUserApp() { - Set apps = getUserApps(); - Iterator appsItr = apps.iterator(); - UserApp userApp = null; - // getting default app - while (appsItr.hasNext()) { - UserApp tempApp = (UserApp) appsItr.next(); - if (tempApp.getApp().getId().equals(new Long(1))) { - userApp = tempApp; - break; - } - } - return userApp; - } - - public void setRoles(SortedSet<Role> roles) { - App app = new App(); - app.setId(new Long(1)); - app.setName("Default"); - addAppRoles(app, roles); - } - - public void removeRole(Long roleId) { - Set apps = getUserApps(); - Iterator appsItr = apps.iterator(); - // getting default app - while (appsItr.hasNext()) { - UserApp tempUserApp = (UserApp) appsItr.next(); - if (tempUserApp.getRole().getId().equals(roleId)) { - appsItr.remove(); - } - } - - } - - @SuppressWarnings("unchecked") - public void addRole(Role role) { - if (role != null) { - SortedSet<Role> roles = getRoles(); - if (roles == null) { - roles = new TreeSet(); - } - roles.add(role); - setRoles(roles); - } - } - - @Override - public int compareTo(Object obj) { - User user = (User) obj; - - String c1 = getLastName() + getFirstName() + getMiddleInitial(); - String c2 = user.getLastName() + user.getFirstName() + user.getMiddleInitial(); - - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserApp.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserApp.java deleted file mode 100644 index edaf0013..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserApp.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * ============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.domain; - - -@SuppressWarnings("rawtypes") -public class UserApp implements java.io.Serializable, Comparable { - - private static final long serialVersionUID = 1L; - private Long userId; - private App app; - private Role role; - private Short priority; - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public App getApp() { - return app; - } - - public void setApp(App app) { - this.app = app; - } - - public Role getRole() { - return role; - } - - public void setRole(Role role) { - this.role = role; - } - - public Short getPriority() { - return this.priority; - } - - public void setPriority(Short priority) { - this.priority = priority; - } - - @Override - public boolean equals(Object other) { - if (this == other) - return true; - if (other == null) - return false; - if (!(other instanceof UserApp)) - return false; - UserApp castOther = (UserApp) other; - - return (this.getUserId().equals(castOther.getUserId())) - && (this.getApp().getId().equals(castOther.getApp().getId())) - && (this.getRole().getId().equals(castOther.getRole().getId())) - && ((this.priority == null && castOther.getPriority() == null) - || this.getPriority().equals(castOther.getPriority())); - } - - @Override - public int hashCode() { - int result = 17; - result = 37 * result + (int) (this.getUserId() == null ? 0 : this.getUserId().intValue()); - result = 37 * result + (int) (this.getApp().getId() == null ? 0 : this.getApp().getId().intValue()); - result = 37 * result + (int) (this.getRole().getId() == null ? 0 : this.getRole().getId().intValue()); - result = 37 * result + (int) (this.priority == null ? 0 : this.priority); - return result; - } - - @Override - public int compareTo(Object other) { - UserApp castOther = (UserApp) other; - Long c1 = (this.getUserId() == null ? 0 : this.getUserId()) - + (this.getApp() == null || this.getApp().getId() == null ? 0 : this.getApp().getId()) - + (this.getRole() == null || this.getRole().getId() == null ? 0 : this.getRole().getId()) - + (this.priority == null ? 0 : this.priority); - Long c2 = (castOther.getUserId() == null ? 0 : castOther.getUserId()) - + (castOther.getApp() == null || castOther.getApp().getId() == null ? 0 : castOther.getApp().getId()) - + (castOther.getRole() == null || castOther.getRole().getId() == null ? 0 : castOther.getRole().getId()) - + (castOther.priority == null ? 0 : castOther.priority); - return c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserAppId.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserAppId.java deleted file mode 100644 index d1fac039..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/UserAppId.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * ============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.domain; - -// Generated Aug 27, 2014 5:51:36 PM by Hibernate Tools 3.4.0.CR1 - -/** - * FnUserRoleId generated by hbm2java - */ -public class UserAppId implements java.io.Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - private Long userId; - private App app; - private Role role; - - public UserAppId() { - super(); - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public App getApp() { - return app; - } - - public void setApp(App app) { - this.app = app; - } - - public Role getRole() { - return role; - } - - public void setRole(Role role) { - this.role = role; - } - - @Override - public boolean equals(Object other) { - if (this == other) - return true; - if (other == null) - return false; - if (!(other instanceof UserAppId)) - return false; - UserAppId castOther = (UserAppId) other; - - return (this.getUserId() == castOther.getUserId()) && (this.getApp().getId() == castOther.getApp().getId()) - && (this.getRole().getId() == castOther.getRole().getId()); - } - - @Override - public int hashCode() { - int result = 17; - result = 37 * result + (int) (this.getUserId() == null ? 0 : this.getUserId().intValue()); - result = 37 * result + (int) (this.getApp().getId() == null ? 0 : this.getApp().getId().intValue()); - result = 37 * result + (int) (this.getRole().getId() == null ? 0 : this.getRole().getId().intValue()); - return result; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Attribute.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Attribute.java deleted file mode 100644 index 948d78a0..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Attribute.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * ============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.domain.support; - -public class Attribute { - private double width; - private double top; - private double left; - private String name; - private double height; - - public double getWidth() { - return width; - } - - public void setWidth(double width) { - this.width = width; - } - - public double getTop() { - return top; - } - - public void setTop(double top) { - this.top = top; - } - - public double getLeft() { - return left; - } - - public void setLeft(double left) { - this.left = left; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getHeight() { - return height; - } - - public void setHeight(double height) { - this.height = height; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java deleted file mode 100644 index 32828b78..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ============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.domain.support; - -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -public class CollaborateList implements Serializable { - - private static final long serialVersionUID = -4104440747626736243L; - private HashSet<String> userNameList = new HashSet<>(); - private static CollaborateList userListData = new CollaborateList(); - - private CollaborateList() { - } - - public static CollaborateList getInstance() { - return userListData; - } - - public Set<String> getAllUserName() { - return userNameList; - } - - public static void addUserName(String name) { - final Set<String> allUserName = CollaborateList.getInstance().getAllUserName(); - if (!allUserName.contains(name)) - allUserName.add(name); - } - - public static void delUserName(String name) { - final Set<String> allUserName = CollaborateList.getInstance().getAllUserName(); - allUserName.remove((String) name); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Container.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Container.java deleted file mode 100644 index ed065b4a..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Container.java +++ /dev/null @@ -1,320 +0,0 @@ -/* - * ============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.domain.support; - -import java.util.List; -import java.util.Map; - -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; - -public class Container { - - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Container.class); - - String id; - - String name; - - Size size; - - Position p; - - Map<String, Container> containerRowCol; - - Map<String, Element> elementRowCol; - - int numOfRows; - - int numOfCols; - - double sum = 0; - - double interEleWd; - - double interEleH; - - double interEleToContainerWd; - - double interEleToContainerH; - - double interEleToInnerContainerWd; - - double interEleToInnerContainerH; - - double top; - - double left; - - double height; - - double width; - - String visibilityType; - - List<Container> innerCList; - - List<Element> elementList; - - public Container() { - - } - - public Container(String id, String name, int numOfRows, int numOfCols, double interEleWd, double interEleH, - double interEleToContainerWd, double interEleToContainerH, double interEleToInnerContainerWd, - double interEleToInnerContainerH) { - - this.id = id; - this.name = name; - this.numOfRows = numOfRows; - this.numOfCols = numOfCols; - this.interEleWd = interEleWd; - this.interEleH = interEleH; - this.interEleToContainerWd = interEleToContainerWd; - this.interEleToContainerH = interEleToContainerH; - this.interEleToInnerContainerWd = interEleToInnerContainerWd; - this.interEleToInnerContainerH = interEleToInnerContainerH; - - } - - public Map<String, Container> getContainerRowCol() { - return containerRowCol; - } - - public Map<String, Element> getElementRowCol() { - return elementRowCol; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public void setInnerContainer(Map<String, Container> innerCon) { - containerRowCol = innerCon; - } - - public void setElements(Map<String, Element> innerE) { - elementRowCol = innerE; - } - - public Position getP() { - return p; - } - - public void setP(Position p) { - this.p = p; - } - - public void setTop(double top) { - this.top = top; - } - - public void setLeft(double left) { - this.left = left; - } - - public void setHeight(double height) { - this.height = height; - } - - public void setWidth(double width) { - this.width = width; - } - - public void setInnerCList(List<Container> innerCList) { - this.innerCList = innerCList; - } - - public void setElementList(List<Element> elementList) { - this.elementList = elementList; - } - - public void setVisibilityType(String visibilityType) { - this.visibilityType = visibilityType; - } - - public Size computeSize() { - logger.debug("computeSize: name is {}", getName()); - Size size = new Size(); - double width = 0; - double height = 0; - for (int i = 0; i < numOfRows; i++) { - if ((containerRowCol != null && containerRowCol.containsKey(i + String.valueOf(numOfCols - 1))) - || (elementRowCol != null && elementRowCol.containsKey(i + String.valueOf(numOfCols - 1)))) { - for (int j = 0; j < numOfCols; j++) { - if (containerRowCol != null && containerRowCol.containsKey(i + String.valueOf(j))) { - width += containerRowCol.get(i + String.valueOf(j)).computeSize().getWidth(); - } else if (elementRowCol != null && elementRowCol.containsKey(i + String.valueOf(j))) - width += elementRowCol.get(i + String.valueOf(j)).computeSize().getWidth(); - } - break; - } - } - - if (this.getName().equals("Broadworks complex") || this.getName().equals("Application Servers") - || this.getName().equals("Call Session Control") || this.getName().equals("GMLC Provider") - || this.getName().equals("Neo") || this.getName().equals("Support")) { - width += (numOfCols - 1) * interEleWd + 2 * interEleToInnerContainerWd; - } else { - width += (numOfCols - 1) * interEleWd + 2 * interEleToContainerWd; - } - size.setWidth(width); - for (int j = 0; j < numOfCols; j++) { - if ((containerRowCol != null && containerRowCol.containsKey(String.valueOf(numOfRows - 1) + j)) - || (elementRowCol != null && elementRowCol.containsKey(String.valueOf(numOfRows - 1) + j))) { - for (int i = 0; i < numOfRows; i++) { - if (containerRowCol != null && containerRowCol.containsKey(i + String.valueOf(j))) { - height += containerRowCol.get(i + String.valueOf(j)).computeSize().getHeight(); - } else if (elementRowCol != null && elementRowCol.containsKey(i + String.valueOf(j))) - height += elementRowCol.get(String.valueOf(i) + String.valueOf(j)).computeSize().getHeight(); - } - break; - } - } - if (this.getName().equals("Broadworks complex") || this.getName().equals("Application Servers") - || this.getName().equals("Call Session Control") || this.getName().equals("GMLC Provider") - || this.getName().equals("Neo") || this.getName().equals("Support")) { - height += (numOfRows - 1) * interEleH + 2 * interEleToInnerContainerH + 0.1; - } else { - if (this.getName().equals("VoLTE UE") || this.getName().equals("3G UE") || this.getName().equals("HC UE-A") - || this.getName().equals("HC UE-B") || this.getName().equals("VNI UE") - || this.getName().equals("PSTN")) { - height += (numOfRows - 1) * interEleH + interEleToContainerH / 2; - } else - height += (numOfRows - 1) * interEleH + 2 * interEleToContainerH; - } - size.setHeight(height); - return size; - } - - public void computeElementPositions() { - double xsum = 0; - double ysum = 0; - for (int i = 0; i < numOfRows; i++) { - for (int j = 0; j < numOfCols; j++) { - if (containerRowCol != null && containerRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { - Container c = containerRowCol.get(String.valueOf(i) + String.valueOf(j)); - Position p = new Position(); - p.x = j * interEleWd + xsum + this.getP().getX() + interEleToContainerWd; - ysum = 0; - for (int k = 0; k < i; k++) { - if (containerRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize() - .getHeight(); - else if (elementRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += elementRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize().getHeight(); - } - p.y = i * interEleH + ysum + this.getP().getY() + interEleToContainerH; - // containerCoord.add(c,p); - xsum += c.computeSize().getWidth(); - c.setP(p); - - } else if (elementRowCol != null && elementRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { - Element e = elementRowCol.get(String.valueOf(i) + String.valueOf(j)); - Position p = new Position(); - if (j == numOfCols - 1) { - for (int t = 0; t < i; t++) { - if (containerRowCol != null - && containerRowCol.containsKey(String.valueOf(t) + String.valueOf(j - 1))) { - if (!elementRowCol.containsKey(String.valueOf(i) + String.valueOf(j - 1)) - && !containerRowCol.containsKey(String.valueOf(i) + String.valueOf(j - 1))) { - xsum += containerRowCol.get(String.valueOf(t) + String.valueOf(j - 1)).computeSize() - .getWidth(); - break; - } - } - } - } - if (this.getName().equals("Broadworks complex") || this.getName().equals("Application Servers") - || this.getName().equals("Call Session Control") || this.getName().equals("GMLC Provider") - || this.getName().equals("Neo") || this.getName().equals("Support")) { - p.x = j * interEleWd + xsum + this.getP().getX() + interEleToInnerContainerWd; - } else if (this.getName().equals("VNI UE") || this.getName().equals("PSTN") - || this.getName().equals("3G UE") || this.getName().equals("HC UE-A") - || this.getName().equals("HC UE-B")) { - p.x = j * interEleWd + xsum + this.getP().getX() + interEleToContainerWd - 0.8; - } else { - p.x = j * interEleWd + xsum + this.getP().getX() + interEleToContainerWd; - } - ysum = 0; - for (int k = 0; k < i; k++) { - if (containerRowCol != null - && containerRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize() - .getHeight(); - else if (elementRowCol != null - && elementRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += elementRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize().getHeight(); - else if (containerRowCol != null) { - for (int chk = j; chk > 0; chk--) { - if (containerRowCol.containsKey(String.valueOf(k) + String.valueOf(chk - 1))) { - if (containerRowCol.get(String.valueOf(k) + String.valueOf(chk - 1)).computeSize() - .getWidth() - + containerRowCol.get(String.valueOf(k) + String.valueOf(chk - 1)).getP() - .getX() > p.x) { - ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(chk - 1)) - .computeSize().getHeight(); - break; - } - } - } - } - - } - if (this.getName().equals("Broadworks complex") || this.getName().equals("Application Servers") - || this.getName().equals("Call Session Control") || this.getName().equals("GMLC Provider") - || this.getName().equals("Neo") || this.getName().equals("Support")) { - p.y = this.getP().getY() + ysum + i * interEleH + interEleToInnerContainerH + 1; - } else { - if (e.getName().equals("")) { - p.y = this.getP().getY() + ysum + i * interEleH + (interEleToContainerH); - } else - p.y = this.getP().getY() + ysum + i * interEleH + interEleToContainerH; - } - xsum += e.computeSize().getWidth(); - e.setP(p); - } - } - xsum = 0; - } - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java deleted file mode 100644 index afd4f589..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * ============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.domain.support; - -import java.util.List; -import java.util.Map; - -public class Domain { - // Unique identifier of the domain - String id; - String name; - Size size; - Position p; - // Horizontal space between a pair of containers - double interContWd = 1.0; - // Vertical space between a pair of containers - double interContH; - double domainToLayoutWd; - double domainToContH; - double domainToLayoutH; - int numOfRowsofContainer; - int numOfColsofContainer; - boolean indexChanged; - Map<String, Container> containerRowCol; - double top; - double left; - double height; - double width; - List<Container> containerList; - double newXafterColl; - double YafterColl; - - public Domain(String id, String name, double interContWd, double interContH, double domainToLayoutWd, - double domainToLayoutH, double domainToContH, int numOfRowsofContainer, int numOfColsofContainer) { - this.id = id; - this.name = name; - this.interContWd = interContWd; - this.interContH = interContH; - this.domainToLayoutWd = domainToLayoutWd; - this.domainToLayoutH = domainToLayoutH; - this.domainToContH = domainToContH; - this.numOfRowsofContainer = numOfRowsofContainer; - this.numOfColsofContainer = numOfColsofContainer; - } - - public Position getP() { - return p; - } - - public void setP(Position p) { - this.p = p; - } - - public void setNewXafterColl(double newXafterColl) { - this.newXafterColl = newXafterColl; - } - - public double getNewXafterColl() { - return newXafterColl; - } - - public double getYafterColl() { - return YafterColl; - } - - public void setYafterColl(double yafterColl) { - YafterColl = yafterColl; - } - - public void setDomainToLayoutWd(double domainToLayoutWd) { - this.domainToLayoutWd = domainToLayoutWd; - } - - public double getDomainToLayoutWd() { - return domainToLayoutWd; - } - - public double getTop() { - return top; - } - - public void setTop(double top) { - this.top = top; - } - - public double getLeft() { - return left; - } - - public void setLeft(double left) { - this.left = left; - } - - public double getHeight() { - return height; - } - - public void setHeight(double height) { - this.height = height; - } - - public double getWidth() { - return width; - } - - public void setWidth(double width) { - this.width = width; - } - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setContainers(Map<String, Container> containerRowCol) { - this.containerRowCol = containerRowCol; - } - - public Map<String, Container> getContainerRowCol() { - return containerRowCol; - } - - public void setContainerList(List<Container> containerList) { - this.containerList = containerList; - } - - public boolean isIndexChanged() { - return indexChanged; - } - - public void setIndexChanged(boolean indexChanged) { - this.indexChanged = indexChanged; - } - - // Compute the size of any domain - public Size computeSize() { - size = new Size(); - size.setHeight(5); - double myWidth = 0; - for (int i = 0; i < numOfRowsofContainer; i++) { - if (containerRowCol != null - && containerRowCol.containsKey(String.valueOf(i) + String.valueOf(numOfColsofContainer - 1))) { - for (int j = 0; j < numOfColsofContainer; j++) { - myWidth += containerRowCol.get(String.valueOf(i) + String.valueOf(j)).computeSize().getWidth(); - } - break; - } - - } - myWidth += (numOfColsofContainer - 1) * interContWd; - if (this.getName().equals("VNI")) - size.setWidth(myWidth - 4); - else - size.setWidth(myWidth); - return size; - } - - public void computeConatinerPositions() { - - double xsum = 0; - for (int i = 0; i < numOfRowsofContainer; i++) { - for (int j = 0; j < numOfColsofContainer; j++) { - if (containerRowCol != null && containerRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { - Container c = containerRowCol.get(String.valueOf(i) + String.valueOf(j)); - Position p = new Position(); - p.x = j * interContWd + xsum + domainToLayoutWd; - double ysum = 0; - for (int k = 0; k < i; k++) { - if (containerRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize() - .getHeight(); - } - p.y = domainToLayoutH + ysum + this.computeSize().getHeight() + domainToContH + i * interContH; - c.setP(p); - xsum += c.computeSize().getWidth(); - } - } - xsum = 0; - - } - - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java deleted file mode 100644 index ba4a1f34..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * ============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.domain.support; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; - -import org.onap.portalsdk.core.domain.FusionVo; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; - -/* Super class from which all data objects descend */ -public class DomainVo extends FusionVo implements Serializable, Cloneable, Comparable { - - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DomainVo.class); - - private static final long serialVersionUID = 1L; - protected Long id; - protected Date created; - protected Date modified; - protected Long createdId; - protected Long modifiedId; - protected Long rowNum; - protected Serializable auditUserId; - protected Set auditTrail = null; - - public DomainVo() { - super(); - } - - public void setId(Long i) { - id = i; - } - - public void setCreated(Date created) { - this.created = created; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public void setCreatedId(Long createdId) { - this.createdId = createdId; - } - - public void setModifiedId(Long modifiedId) { - this.modifiedId = modifiedId; - } - - public void setAuditUserId(Serializable auditUserId) { - this.auditUserId = auditUserId; - } - - public void setRowNum(Long rowNum) { - this.rowNum = rowNum; - } - - public void setAuditTrail(Set auditTrail) { - this.auditTrail = auditTrail; - } - - public Long getId() { - return id; - } - - public Date getCreated() { - return created; - } - - public Date getModified() { - return modified; - } - - public Long getCreatedId() { - return createdId; - } - - public Long getModifiedId() { - return modifiedId; - } - - public Serializable getAuditUserId() { - return auditUserId; - } - - public Long getRowNum() { - return rowNum; - } - - public Set getAuditTrail() { - return auditTrail; - } - - public Object copy() { - return copy(false); - } - - public Object copy(boolean isIdNull) { - // let's create a "copy" of the object using serialization - ByteArrayOutputStream baos = null; - ByteArrayInputStream bais = null; - ObjectOutputStream oos = null; - ObjectInputStream ois = null; - - DomainVo newVo = null; - try { - baos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(baos); - oos.writeObject(this); - - bais = new ByteArrayInputStream(baos.toByteArray()); - ois = new ObjectInputStream(bais); - newVo = (DomainVo) ois.readObject(); - - if (isIdNull) { - newVo.setId(null); - } - - } catch (Exception e) { - logger.error(EELFLoggerDelegate.errorLogger, "copy failed", e); - } - - return newVo; - } - - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - @Override - public boolean equals(Object other) { - if (this == other) - return true; - if (other == null) - return false; - if (!(other instanceof DomainVo)) - return false; - DomainVo castOther = (DomainVo) other; - return this.getId() == castOther.getId() - && this.getCreated().equals(castOther.getCreated()) - && this.getCreatedId() == castOther.getCreatedId() - && this.getModified().equals(castOther.getModified()) - && this.getModifiedId() == castOther.getModifiedId() - ; - } - - @Override - public int compareTo(Object obj) { - Long c1 = getId(); - Long c2 = ((DomainVo) obj).getId(); - return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Element.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Element.java deleted file mode 100644 index 1bf6a150..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Element.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * ============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.domain.support; - -public class Element { - - String id; - String name; - - double top; - - double left; - - double height; - - double width; - - String imgFileName; - - String borderType; - - String bgColor; - - ElementDetails details; - - Position p; - - public Element(String id, String name) { - this.id = id; - this.name = name; - } - - public Element(String id, String name, String imgFilename, String bgColor, String borderType, - ElementDetails details) { - this.id = id; - this.name = name; - this.imgFileName = imgFilename; - this.bgColor = bgColor; - this.borderType = borderType; - this.details = details; - - } - - public void setBgColor(String bgColor) { - this.bgColor = bgColor; - } - - public void setId(String id) { - this.id = id; - } - - public void setTop(double top) { - this.top = top; - } - - public void setLeft(double left) { - this.left = left; - } - - public void setHeight(double height) { - this.height = height; - } - - public void setWidth(double width) { - this.width = width; - } - - public String getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Position getP() { - return p; - } - - public void setP(Position p) { - this.p = p; - } - - public void setBorderType(String borderType) { - this.borderType = borderType; - } - - public String getImgFileName() { - return imgFileName; - } - - public void setImgFileName(String imgFileName) { - this.imgFileName = imgFileName; - } - - public String getBorderType() { - return borderType; - } - - public ElementDetails getDetails() { - return details; - } - - public void setDetails(ElementDetails details) { - this.details = details; - } - - public Size computeSize() { - Size size = new Size(); - size.setWidth(0.5 * 7.0); - size.setHeight(0.5 * 3.0); - return size; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/ElementDetails.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/ElementDetails.java deleted file mode 100644 index 73ccd5d6..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/ElementDetails.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ============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.domain.support; - -public class ElementDetails { - - String logical_group; - String display_longname; - String description; - String primary_function; - String network_function; - String key_interfaces; - String location; - String vendor; - String vendor_shortname; - String enclosingContainer; - - public ElementDetails(String logical_group, String display_longname, String description, String primary_function, - String network_function, String key_interfaces, String location, String vendor, String vendor_shortname, - String enclosingContainer) { - - this.logical_group = logical_group; - this.display_longname = display_longname; - this.description = description; - this.primary_function = primary_function; - this.network_function = network_function; - this.key_interfaces = key_interfaces; - this.location = location; - this.vendor = vendor; - this.vendor_shortname = vendor_shortname; - this.enclosingContainer = enclosingContainer; - } - - public String getLogical_group() { - return logical_group; - } - - public void setLogical_group(String logical_group) { - this.logical_group = logical_group; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/FusionCommand.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/FusionCommand.java deleted file mode 100644 index 3ee8f642..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/FusionCommand.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * ============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.domain.support; - -import org.onap.portalsdk.core.FusionObject; - -public class FusionCommand implements FusionObject { - - private String task; - - public String getTask() { - return task; - } - - public void setTask(String task) { - this.task = task; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java deleted file mode 100644 index c729eef4..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java +++ /dev/null @@ -1,955 +0,0 @@ -/* - * ============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.domain.support; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -public class Layout { - - Map<String, Domain> domainRowCol; - - Map<String, Domain> originalDomainRowCol; - - // Horizontal space between a pair of domains - double interDomainWd; - // Vertical space between a pair of domains - double interDomainH; - // Computing the co-ordinates of any domain - int numberofRowsofDomains; - - int numberofColsofDomains; - - Map<String, Domain> collapsedDomains; - - List<Domain> collapsedDomainsNewList; - - public Layout(Map<String, Domain> domainRowCol, double interDomainWd, double interDomainH, - int numberofRowsofDomains, int numberofColsofDomains) { - - this.domainRowCol = domainRowCol; - this.interDomainWd = interDomainWd; - this.interDomainH = interDomainH; - this.numberofRowsofDomains = numberofRowsofDomains; - this.numberofColsofDomains = numberofColsofDomains; - this.collapsedDomains = new HashMap<>(); - this.originalDomainRowCol = new TreeMap<>(); - // nline - this.collapsedDomainsNewList = new ArrayList<>(); - } - - public List<Domain> getCollapsedDomainsNewList() { - return collapsedDomainsNewList; - } - - public void setCollapsedDomainsNewList(List<Domain> collapsedDomainsNewList) { - this.collapsedDomainsNewList = collapsedDomainsNewList; - } - - public void setCollapsedDomains(Map<String, Domain> collapsedDomains) { - this.collapsedDomains = collapsedDomains; - } - - public Map<String, Domain> getCollapsedDomains() { - return collapsedDomains; - } - - public int getNumberofColsofDomains() { - return numberofColsofDomains; - } - - public void setNumberofColsofDomains(int numberofColsofDomains) { - this.numberofColsofDomains = numberofColsofDomains; - } - - public Map<String, Domain> getDomainRowCol() { - return domainRowCol; - } - - public void setDomainRowCol(Map<String, Domain> domainRowCol) { - this.domainRowCol = domainRowCol; - } - - public void computeDomainPositions() { - double xsum = 0; - double domainTolayout = 10.6; - for (int i = 0; i < numberofRowsofDomains; i++) { - for (int j = 0; j < numberofColsofDomains; j++) { - if (domainRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { - Domain d = domainRowCol.get(String.valueOf(i) + String.valueOf(j)); - Position p = new Position(); - if (j == 0) - p.x = domainTolayout; - else - p.x = j * interDomainWd + xsum + domainTolayout; - if (getCollapsedDomainsNewList().size() > 0) - p.x += accountForPlusSpaceBefore(d); - xsum += d.computeSize().getWidth(); - double ysum = 0; - for (int k = 0; k < i; k++) { - if (domainRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += domainRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize().getHeight(); - } - p.y = (i + 1) * interDomainH + ysum; - d.setP(p); - - } - } - xsum = 0; - } - } - - public void computeDomainPositionsModified() { - for (int i = 0; i < numberofRowsofDomains; i++) { - for (int j = 0; j < numberofColsofDomains; j++) { - if (domainRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { - Domain d = domainRowCol.get(String.valueOf(i) + String.valueOf(j)); - Position p = new Position(); - Map<String, Container> enclosedContainers = d.getContainerRowCol(); - for (Map.Entry<String, Container> entry : enclosedContainers.entrySet()) { - if (entry.getKey().equals("00")) { - double containerX = entry.getValue().getP().getX(); - p.x = containerX; - double ysum = 0; - for (int k = 0; k < i; k++) { - if (domainRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) - ysum += domainRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize() - .getHeight(); - } - p.y = (i + 1) * interDomainH + ysum; - d.setP(p); - break; - } - } - } - } - } - - } - - public Layout collapseDomainModified(String domainsToCollapse) { - - if (domainsToCollapse == null || domainsToCollapse.isEmpty()) - return null; - - Map<String, Domain> updatedRC = new HashMap<>(); - - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - updatedRC.put(copyEntry.getKey(), copyEntry.getValue()); - } - - Map<String, Domain> updatedRCSorted = new TreeMap<>(updatedRC); - - Map<String, Domain> collapsedDomainMap = getCollapsedDomains(); - - List<Domain> collapsedDomainNewL = getCollapsedDomainsNewList(); - - if (collapsedDomainNewL.size() == 0) { - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - originalDomainRowCol.put(copyEntry.getKey(), copyEntry.getValue()); - } - } - - Map<String, Domain> updatedRCSortedTrunc = new TreeMap<>(); - - int colToDelete = 0; - for (Map.Entry<String, Domain> entry : updatedRCSorted.entrySet()) { - if (entry.getValue().getName().equals(domainsToCollapse)) { - if (entry.getValue().isIndexChanged()) { - collapsedDomainMap.put("0" + String.valueOf(Integer.parseInt(entry.getKey()) + 1), - entry.getValue()); - - } else { - collapsedDomainMap.put(entry.getKey(), entry.getValue()); - } - - collapsedDomainNewL.add(entry.getValue()); - setNumberofColsofDomains(getNumberofColsofDomains() - 1); - updatedRC.remove(entry.getKey()); - colToDelete = Character.getNumericValue(entry.getKey().toCharArray()[1]); - break; - } - } - - for (Map.Entry<String, Domain> copyEntry : updatedRCSorted.entrySet()) { - updatedRCSortedTrunc.put(copyEntry.getKey(), copyEntry.getValue()); - } - - for (Map.Entry<String, Domain> rmv : updatedRCSorted.entrySet()) { - if (Character.getNumericValue(rmv.getKey().toCharArray()[1]) <= colToDelete) { - updatedRCSortedTrunc.remove(rmv.getKey()); - } - } - - for (Map.Entry<String, Domain> updateOthers : updatedRCSortedTrunc.entrySet()) { - char update[] = updateOthers.getKey().toCharArray(); - int charToupdate = Character.getNumericValue(update[1]); - --charToupdate; - String resultRowCol = String.valueOf(update[0]) + String.valueOf(charToupdate); - updateOthers.getValue().setIndexChanged(true); - updatedRC.put(resultRowCol, updateOthers.getValue()); - updatedRC.remove(updateOthers.getKey()); - - } - setDomainRowCol(updatedRC); - - double currDistFromLftM = 11.0; - for (Map.Entry<String, Domain> cd : updatedRC.entrySet()) { - Domain d = cd.getValue(); - double accountPlus = accountForPlusSpaceBefore(d); - d.setDomainToLayoutWd(currDistFromLftM + accountPlus); - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - currDistFromLftM += d.computeSize().getWidth() + 2; - } - - // nline - // Insert method invocation - updatePlusPosition(collapsedDomainNewL, updatedRC); - - // order changed - setCollapsedDomains(collapsedDomainMap); - setCollapsedDomainsNewList(collapsedDomainNewL); - - computeDomainPositionsModified(); - return this; - } - - public Layout collapseDomainNew(String domainsToCollapse) { - - if (domainsToCollapse == null || domainsToCollapse.isEmpty()) - return null; - - Map<String, Domain> updatedRC = new HashMap<>(); - - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - updatedRC.put(copyEntry.getKey(), copyEntry.getValue()); - } - - Map<String, Domain> updatedRCSorted = new TreeMap<>(updatedRC); - - Map<String, Domain> collapsedDomainMap = getCollapsedDomains(); - - List<Domain> collapsedDomainNewL = getCollapsedDomainsNewList(); - - if (collapsedDomainNewL.isEmpty()) { - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - originalDomainRowCol.put(copyEntry.getKey(), copyEntry.getValue()); - } - } - - Map<String, Domain> updatedRCSortedTrunc = new TreeMap<>(); - - int colToDelete = 0; - for (Map.Entry<String, Domain> entry : updatedRCSorted.entrySet()) { - if (entry.getValue().getName().equals(domainsToCollapse)) { - if (entry.getValue().isIndexChanged()) { - collapsedDomainMap.put("0" + String.valueOf(Integer.parseInt(entry.getKey()) + 1), - entry.getValue()); - - } else { - collapsedDomainMap.put(entry.getKey(), entry.getValue()); - } - - collapsedDomainNewL.add(entry.getValue()); - setNumberofColsofDomains(getNumberofColsofDomains() - 1); - updatedRC.remove(entry.getKey()); - colToDelete = Character.getNumericValue(entry.getKey().toCharArray()[1]); - break; - } - } - - for (Map.Entry<String, Domain> copyEntry : updatedRCSorted.entrySet()) { - updatedRCSortedTrunc.put(copyEntry.getKey(), copyEntry.getValue()); - } - - for (Map.Entry<String, Domain> rmv : updatedRCSorted.entrySet()) { - if (Character.getNumericValue(rmv.getKey().toCharArray()[1]) <= colToDelete) { - updatedRCSortedTrunc.remove(rmv.getKey()); - } - } - - for (Map.Entry<String, Domain> updateOthers : updatedRCSortedTrunc.entrySet()) { - char[] update = updateOthers.getKey().toCharArray(); - int charToupdate = Character.getNumericValue(update[1]); - --charToupdate; - String resultRowCol = String.valueOf(update[0]) + String.valueOf(charToupdate); - updateOthers.getValue().setIndexChanged(true); - updatedRC.put(resultRowCol, updateOthers.getValue()); - updatedRC.remove(updateOthers.getKey()); - - } - setDomainRowCol(updatedRC); - - double currDistFromLftM = 11.0; - - boolean isDisplayed; - for (Map.Entry<String, Domain> orgEntry : originalDomainRowCol.entrySet()) { - isDisplayed = false; - for (Map.Entry<String, Domain> cd : updatedRC.entrySet()) { - if (cd.getValue().getName().equals(orgEntry.getValue().getName())) { - Domain d = cd.getValue(); - d.setDomainToLayoutWd(currDistFromLftM); - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - currDistFromLftM += d.computeSize().getWidth() + 1; - isDisplayed = true; - break; - } - } - - if (!isDisplayed) { - Domain myCollapsed = orgEntry.getValue(); - myCollapsed.setNewXafterColl(currDistFromLftM); - myCollapsed.setYafterColl(myCollapsed.getP().getY()); - currDistFromLftM += 4; - } - } - - setCollapsedDomains(collapsedDomainMap); - setCollapsedDomainsNewList(collapsedDomainNewL); - - computeDomainPositionsModified(); - return this; - - } - - public Layout collapseDomain(String domainsToCollapse) { - - Map<String, Domain> updatedRC = new HashMap<>(); - - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - updatedRC.put(copyEntry.getKey(), copyEntry.getValue()); - } - - Map<String, Domain> updatedRCSorted = new TreeMap<>(updatedRC); - - Map<String, Domain> collapsedDomainMap = getCollapsedDomains(); - - if (collapsedDomainMap.size() == 0) { - for (Map.Entry<String, Domain> copyEntry : domainRowCol.entrySet()) { - originalDomainRowCol.put(copyEntry.getKey(), copyEntry.getValue()); - } - } - - double prevDomXCordinate = 0.0; - Map<String, Domain> updatedRCSortedTrunc = new TreeMap<>(); - int colToDelete = 0; - for (Map.Entry<String, Domain> entry : updatedRCSorted.entrySet()) { - if (entry.getValue().getName().equals(domainsToCollapse)) { - if (entry.getValue().isIndexChanged()) - collapsedDomainMap.put("0" + String.valueOf(Integer.parseInt(entry.getKey()) + 1), - entry.getValue()); - else - collapsedDomainMap.put(entry.getKey(), entry.getValue()); - prevDomXCordinate = entry.getValue().getP().getX(); - entry.getValue().getP().setX(prevDomXCordinate - 2); - setNumberofColsofDomains(getNumberofColsofDomains() - 1); - updatedRC.remove(entry.getKey()); - colToDelete = Character.getNumericValue(entry.getKey().toCharArray()[1]); - break; - } - } - - setCollapsedDomains(collapsedDomainMap); - - for (Map.Entry<String, Domain> copyEntry : updatedRCSorted.entrySet()) { - updatedRCSortedTrunc.put(copyEntry.getKey(), copyEntry.getValue()); - } - - for (Map.Entry<String, Domain> rmv : updatedRCSorted.entrySet()) { - if (Character.getNumericValue(rmv.getKey().toCharArray()[1]) <= colToDelete) { - updatedRCSortedTrunc.remove(rmv.getKey()); - } - } - - for (Map.Entry<String, Domain> updateOthers : updatedRCSortedTrunc.entrySet()) { - char update[] = updateOthers.getKey().toCharArray(); - int charToupdate = Character.getNumericValue(update[1]); - --charToupdate; - String resultRowCol = String.valueOf(update[0]) + String.valueOf(charToupdate); - updateOthers.getValue().setIndexChanged(true); - updatedRC.put(resultRowCol, updateOthers.getValue()); - updatedRC.remove(updateOthers.getKey()); - - } - - setDomainRowCol(updatedRC); - - for (Map.Entry<String, Domain> entry : updatedRCSortedTrunc.entrySet()) { - Domain d = entry.getValue(); - if (collapsedDomains.size() == 2 && collapsedDomains.containsKey("00") && collapsedDomains.containsKey("01") - && domainsToCollapse.equals("RAN")) { - if (d.getName().equals("USP")) - d.setDomainToLayoutWd(prevDomXCordinate); - else if (d.getName().equals("VNI")) - d.setDomainToLayoutWd(prevDomXCordinate + 8); - else - d.setDomainToLayoutWd(prevDomXCordinate + 10); - } else if (domainsToCollapse.equals("RAN") && !d.getName().equals("EPC") && collapsedDomains.size() < 3) - d.setDomainToLayoutWd(prevDomXCordinate + 11); - else if (domainsToCollapse.equals("RAN") && collapsedDomains.size() == 3 - && collapsedDomains.containsKey("01") && collapsedDomains.containsKey("04")) { - if (d.getName().equals("USP")) - d.setDomainToLayoutWd(prevDomXCordinate); - else - d.setDomainToLayoutWd(prevDomXCordinate + 10); - } - - else if (collapsedDomains.containsKey("00") && collapsedDomains.size() == 3 - && collapsedDomains.containsKey("01") && collapsedDomains.containsKey("02")) { - if (d.getName().equals("VNI")) - d.setDomainToLayoutWd(prevDomXCordinate + 10); - else - d.setDomainToLayoutWd(prevDomXCordinate); - - } - - else if (collapsedDomains.containsKey("00") && collapsedDomains.size() == 3 - && collapsedDomains.containsKey("01") && collapsedDomains.containsKey("03")) { - if (d.getName().equals("VNI")) - d.setDomainToLayoutWd(prevDomXCordinate + 10); - else - d.setDomainToLayoutWd(prevDomXCordinate); - - } - - else { - d.setDomainToLayoutWd(prevDomXCordinate); - } - d.computeConatinerPositions(); - prevDomXCordinate = d.getP().getX(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - } - computeDomainPositions(); - return this; - - } - - public Layout uncollapseDomainModified(String domainToUnCollapse) { - Map<String, Domain> currentDomainsSorted = new TreeMap<>(domainRowCol); - Map<String, Domain> updateDomains = new TreeMap<>(); - Map<String, Domain> collapsedDomainList = getCollapsedDomains(); - Map<String, Domain> collapsedDomainListSorted = new TreeMap<>(collapsedDomainList); - - List<Domain> domainstoUpd = new ArrayList<>(); - - int colToUnCollapse = 99; - - Domain domainToInsert = null; - - if (collapsedDomains.size() == 0) { - for (Map.Entry<String, Domain> unindexDomain : originalDomainRowCol.entrySet()) { - Domain dm = unindexDomain.getValue(); - dm.setIndexChanged(false); - } - } - - for (Map.Entry<String, Domain> entry : collapsedDomainListSorted.entrySet()) { - if (entry.getValue().getName().equals(domainToUnCollapse)) { - colToUnCollapse = Character.getNumericValue(entry.getKey().toCharArray()[1]); - domainToInsert = entry.getValue(); - collapsedDomainList.remove(entry.getKey()); - break; - } - } - - domainstoUpd.add(domainToInsert); - - int lastKeyCol = -1; - for (Map.Entry<String, Domain> entry : originalDomainRowCol.entrySet()) { - int currcol = Character.getNumericValue(entry.getKey().toCharArray()[1]); - if (currcol < colToUnCollapse) { - for (Map.Entry<String, Domain> currDomainsEntry : currentDomainsSorted.entrySet()) { - if (currDomainsEntry.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(currDomainsEntry.getKey(), currDomainsEntry.getValue()); - lastKeyCol = Character.getNumericValue(currDomainsEntry.getKey().toCharArray()[1]); - break; - } - } - } else { - String newKey = "0" + String.valueOf(lastKeyCol + 1); - if (currcol == colToUnCollapse) { - updateDomains.put(newKey, domainToInsert); - ++lastKeyCol; - } else { - for (Map.Entry<String, Domain> currDomainsEnt : currentDomainsSorted.entrySet()) { - if (currDomainsEnt.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(newKey, currDomainsEnt.getValue()); - domainstoUpd.add(currDomainsEnt.getValue()); - ++lastKeyCol; - break; - } - } - } - - } - } - - setNumberofColsofDomains(getNumberofColsofDomains() + 1); - setDomainRowCol(updateDomains); - setCollapsedDomains(collapsedDomainList); - - for (int i = 0; i < domainstoUpd.size(); i++) { - Domain d = domainstoUpd.get(i); - double newX = 0.0; - if (i + 1 < domainstoUpd.size()) - newX = domainstoUpd.get(i + 1).getP().getX(); - else - newX = domainstoUpd.get(i).getP().getX() + 32; - - if (d.getName().equals("Datacenter with AIC")) - newX += 2; - d.setDomainToLayoutWd(newX); - - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - - } - - computeDomainPositions(); - return this; - - } - - public Layout uncollapseDomain(String domainToCollapse) { - Map<String, Domain> currentDomainsSorted = new TreeMap<>(domainRowCol); - Map<String, Domain> updateDomains = new TreeMap<String, Domain>(); - Map<String, Domain> collapsedDomainList = getCollapsedDomains(); - Map<String, Domain> collapsedDomainListSorted = new TreeMap<String, Domain>(collapsedDomainList); - - List<Domain> domainstoUpd = new ArrayList<>(); - for (Map.Entry<String, Domain> entry : collapsedDomainListSorted.entrySet()) { - if (entry.getValue().getName().equals(domainToCollapse)) { - Domain domainInserted = entry.getValue(); - if (currentDomainsSorted != null) { - int colToUnCollapse = Character.getNumericValue(entry.getKey().toCharArray()[1]); - for (Map.Entry<String, Domain> curr : currentDomainsSorted.entrySet()) { - if (Character.getNumericValue(curr.getKey().toCharArray()[1]) < colToUnCollapse) { - updateDomains.put(curr.getKey(), curr.getValue()); - } else { - updateDomains.put("0" + String.valueOf(Integer.parseInt(curr.getKey()) + 1), - curr.getValue()); - domainstoUpd.add(curr.getValue()); - } - } - } - updateDomains.put(entry.getKey(), entry.getValue()); - collapsedDomainList.remove(entry.getKey()); - break; - - } - } - setNumberofColsofDomains(getNumberofColsofDomains() + 1); - setDomainRowCol(updateDomains); - setCollapsedDomains(collapsedDomainList); - - for (int i = 0; i < domainstoUpd.size(); i++) { - Domain d = domainstoUpd.get(i); - double newX = 0.0; - if (i + 1 < domainstoUpd.size()) - newX = domainstoUpd.get(i + 1).getP().getX(); - // d.setDomainToLayoutWd(domainstoUpd.get(i+1).getP().getX()); - else - newX = domainstoUpd.get(i).getP().getX() + 38; - - d.setDomainToLayoutWd(newX); - - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - } - - computeDomainPositions(); - return this; - } - - public Layout uncollapseDomainNew(String domainToUnCollapse) { - Map<String, Domain> currentDomainsSorted = new TreeMap<String, Domain>(domainRowCol); - Map<String, Domain> updateDomains = new TreeMap<String, Domain>(); - Map<String, Domain> collapsedDomainList = getCollapsedDomains(); - - List<Domain> domainstoUpd = new ArrayList<>(); - - // nline - List<Domain> collapsedDomainNewLL = getCollapsedDomainsNewList(); - - int colToUnCollapse = 99; - - Domain domainToInsert = null; - - // nline - if (collapsedDomainNewLL.isEmpty()) { - for (Map.Entry<String, Domain> unindexDomain : originalDomainRowCol.entrySet()) { - Domain dm = unindexDomain.getValue(); - dm.setIndexChanged(false); - } - } - - for (Map.Entry<String, Domain> entry : originalDomainRowCol.entrySet()) { - if (entry.getValue().getName().equals(domainToUnCollapse)) { - colToUnCollapse = Character.getNumericValue(entry.getKey().toCharArray()[1]); - domainToInsert = entry.getValue(); - collapsedDomainList.remove(entry.getKey()); - // nline - collapsedDomainNewLL.remove(entry.getValue()); - break; - } - } - - domainstoUpd.add(domainToInsert); - - int lastKeyCol = -1; - for (Map.Entry<String, Domain> entry : originalDomainRowCol.entrySet()) { - int currcol = Character.getNumericValue(entry.getKey().toCharArray()[1]); - if (currcol < colToUnCollapse) { - for (Map.Entry<String, Domain> currDomainsEntry : currentDomainsSorted.entrySet()) { - if (currDomainsEntry.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(currDomainsEntry.getKey(), currDomainsEntry.getValue()); - lastKeyCol = Character.getNumericValue(currDomainsEntry.getKey().toCharArray()[1]); - break; - } - } - } else { - String newKey = "0" + String.valueOf(lastKeyCol + 1); - if (currcol == colToUnCollapse) { - updateDomains.put(newKey, domainToInsert); - ++lastKeyCol; - } else { - for (Map.Entry<String, Domain> currDomainsEnt : currentDomainsSorted.entrySet()) { - if (currDomainsEnt.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(newKey, currDomainsEnt.getValue()); - domainstoUpd.add(currDomainsEnt.getValue()); - ++lastKeyCol; - break; - } - } - } - - } - } - - setNumberofColsofDomains(getNumberofColsofDomains() + 1); - setDomainRowCol(updateDomains); - - double currDistFromLftMargin = 11.0; - for (Map.Entry<String, Domain> cd : updateDomains.entrySet()) { - Domain d = cd.getValue(); - double accountPlus = accountForPlusSpaceBefore(d); - d.setDomainToLayoutWd(currDistFromLftMargin + accountPlus); - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - currDistFromLftMargin += d.computeSize().getWidth() + 2; - - } - - // nline - updatePlusPosition(collapsedDomainNewLL, updateDomains); - - // order changed - setCollapsedDomains(collapsedDomainList); - - // nline - setCollapsedDomainsNewList(collapsedDomainNewLL); - - computeDomainPositionsModified(); - return this; - - } - - public Layout uncollapseDomainNew1(String domainToUnCollapse) { - - if (domainToUnCollapse == null || domainToUnCollapse.isEmpty()) - return null; - - Map<String, Domain> currentDomainsSorted = new TreeMap<String, Domain>(domainRowCol); - Map<String, Domain> updateDomains = new TreeMap<String, Domain>(); - Map<String, Domain> collapsedDomainList = getCollapsedDomains(); - - List<Domain> domainstoUpd = new ArrayList<>(); - - // nline - List<Domain> collapsedDomainNewLL = getCollapsedDomainsNewList(); - - int colToUnCollapse = 99; - - Domain domainToInsert = null; - - // nline - if (collapsedDomainNewLL.isEmpty()) { - for (Map.Entry<String, Domain> unindexDomain : originalDomainRowCol.entrySet()) { - Domain dm = unindexDomain.getValue(); - dm.setIndexChanged(false); - } - } - - for (Map.Entry<String, Domain> entry : originalDomainRowCol.entrySet()) { - if (entry.getValue().getName().equals(domainToUnCollapse)) { - colToUnCollapse = Character.getNumericValue(entry.getKey().toCharArray()[1]); - domainToInsert = entry.getValue(); - collapsedDomainList.remove(entry.getKey()); - // nline - collapsedDomainNewLL.remove(entry.getValue()); - break; - } - } - - domainstoUpd.add(domainToInsert); - - int lastKeyCol = -1; - for (Map.Entry<String, Domain> entry : originalDomainRowCol.entrySet()) { - int currcol = Character.getNumericValue(entry.getKey().toCharArray()[1]); - if (currcol < colToUnCollapse) { - for (Map.Entry<String, Domain> currDomainsEntry : currentDomainsSorted.entrySet()) { - if (currDomainsEntry.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(currDomainsEntry.getKey(), currDomainsEntry.getValue()); - lastKeyCol = Character.getNumericValue(currDomainsEntry.getKey().toCharArray()[1]); - break; - } - } - } else { - String newKey = "0" + String.valueOf(lastKeyCol + 1); - if (currcol == colToUnCollapse) { - updateDomains.put(newKey, domainToInsert); - ++lastKeyCol; - } else { - for (Map.Entry<String, Domain> currDomainsEnt : currentDomainsSorted.entrySet()) { - if (currDomainsEnt.getValue().getName().equals(entry.getValue().getName())) { - updateDomains.put(newKey, currDomainsEnt.getValue()); - domainstoUpd.add(currDomainsEnt.getValue()); - ++lastKeyCol; - break; - } - } - } - - } - } - - setNumberofColsofDomains(getNumberofColsofDomains() + 1); - setDomainRowCol(updateDomains); - - double currDistFromLftM = 11.0; - - boolean isDisplayed; - for (Map.Entry<String, Domain> orgEntry : originalDomainRowCol.entrySet()) { - isDisplayed = false; - for (Map.Entry<String, Domain> cd : updateDomains.entrySet()) { - if (cd.getValue().getName().equals(orgEntry.getValue().getName())) { - Domain d = cd.getValue(); - d.setDomainToLayoutWd(currDistFromLftM); - d.computeConatinerPositions(); - for (Map.Entry<String, Container> entry1 : d.getContainerRowCol().entrySet()) { - Container c = entry1.getValue(); - c.computeSize(); - c.computeElementPositions(); - if (c.getContainerRowCol() != null) { - for (Map.Entry<String, Container> entryInner : c.getContainerRowCol().entrySet()) { - Container inner = entryInner.getValue(); - inner.computeElementPositions(); - } - } - } - currDistFromLftM += d.computeSize().getWidth() + 1; - isDisplayed = true; - break; - } - } - - if (!isDisplayed) { - Domain myCollapsed = orgEntry.getValue(); - myCollapsed.setNewXafterColl(currDistFromLftM); - currDistFromLftM += 4; - } - } - - // order changed - setCollapsedDomains(collapsedDomainList); - - // nline - setCollapsedDomainsNewList(collapsedDomainNewLL); - - computeDomainPositionsModified(); - return this; - - } - - private void updatePlusPosition(List<Domain> collapsedDNewL, Map<String, Domain> displayedDomainMap) { - List<Domain> copyCollapseList = new ArrayList<>(); - - for (Domain copyCollapse : collapsedDNewL) { - copyCollapseList.add(copyCollapse); - } - - int orgColofCollapsed = -1; - int orgColofDisplayed = -1; - int orgColofDisplayedOtherPlus = -1; - - for (Domain plus : collapsedDNewL) { - double distOfCollFrmLft = 0.0; - for (Map.Entry<String, Domain> colCheck : originalDomainRowCol.entrySet()) { - if (colCheck.getValue().getName().equals(plus.getName())) { - orgColofCollapsed = Character.getNumericValue(colCheck.getKey().toCharArray()[1]); - break; - } - } - for (Map.Entry<String, Domain> displayedEntry : displayedDomainMap.entrySet()) { - - for (Map.Entry<String, Domain> colCheck1 : originalDomainRowCol.entrySet()) { - if (colCheck1.getValue().getName().equals(displayedEntry.getValue().getName())) { - orgColofDisplayed = Character.getNumericValue(colCheck1.getKey().toCharArray()[1]); - break; - } - } - if (orgColofDisplayed < orgColofCollapsed) { - distOfCollFrmLft += displayedEntry.getValue().computeSize().getWidth(); - } - - } - - for (Domain collp : copyCollapseList) { - if (!collp.getName().equals(plus.getName())) { - for (Map.Entry<String, Domain> colCheck2 : originalDomainRowCol.entrySet()) { - if (colCheck2.getValue().getName().equals(collp.getName())) { - orgColofDisplayedOtherPlus = Character.getNumericValue(colCheck2.getKey().toCharArray()[1]); - break; - } - } - if (orgColofDisplayedOtherPlus < orgColofCollapsed) { - distOfCollFrmLft += 3.0; - } - } - } - - plus.setNewXafterColl(distOfCollFrmLft + 1.5); - - } - } - - private double accountForPlusSpaceBefore(Domain d) { - - int orgColofCollapsed = 0; - int orgColofDisplayed = 0; - double distFromLftM = 0.0; - - for (Map.Entry<String, Domain> colCheckk : originalDomainRowCol.entrySet()) { - if (colCheckk.getValue().getName().equals(d.getName())) { - orgColofDisplayed = Character.getNumericValue(colCheckk.getKey().toCharArray()[1]); - break; - } - } - - for (Domain collapsed : getCollapsedDomainsNewList()) { - for (Map.Entry<String, Domain> colCheck : originalDomainRowCol.entrySet()) { - if (colCheck.getValue().getName().equals(collapsed.getName())) { - orgColofCollapsed = Character.getNumericValue(colCheck.getKey().toCharArray()[1]); - break; - } - } - - if (orgColofCollapsed < orgColofDisplayed) { - distFromLftM += 2; - } - } - return distFromLftM; - - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java deleted file mode 100644 index eef7c27a..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * ============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.domain.support; - -import java.io.Serializable; - -public class NameValueId implements Serializable { - - private static final long serialVersionUID = 1L; - private String lab; - private String val; - - public NameValueId() { - // No-arg constructor - } - - public NameValueId(String value, String label) { - setVal(value); - setLab(label); - } - - public String getLab() { - return lab; - } - - public String getVal() { - return val; - } - - public void setLab(String label) { - this.lab = label; - } - - public void setVal(String value) { - this.val = value; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - - if (o == null) { - return false; - } - - if (!(o instanceof NameValueId)) { - return false; - } - - final NameValueId nameValueId = (NameValueId) o; - - if (!getVal().equals(nameValueId.getVal())) { - return false; - } - - if (!getLab().equals(nameValueId.getLab())) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - return getVal().hashCode(); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Position.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Position.java deleted file mode 100644 index e0946d0b..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Position.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * ============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.domain.support; - -public class Position { - double x; - double y; - - public double getX() { - return x; - } - - public void setX(double x) { - this.x = x; - } - - public double getY() { - return y; - } - - public void setY(double y) { - this.y = y; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Size.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Size.java deleted file mode 100644 index 6fcd178e..00000000 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Size.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * ============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.domain.support; - -public class Size { - private double width; - private double height; - - public double getWidth() { - return width; - } - - public void setWidth(double width) { - this.width = width; - } - - public double getHeight() { - return height; - } - - public void setHeight(double height) { - this.height = height; - } - -} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/exception/support/FusionException.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/exception/support/FusionException.java index f3b27047..00acba02 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/exception/support/FusionException.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/exception/support/FusionException.java @@ -37,7 +37,7 @@ */ package org.onap.portalsdk.core.exception.support; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; public interface FusionException extends FusionObject { } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java index de65775b..5fb925fc 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java @@ -42,7 +42,6 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.onap.portalsdk.core.controller.FusionBaseController; import org.onap.portalsdk.core.domain.App; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java index 0e23a36f..ed7c1e0c 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java @@ -41,9 +41,9 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.onap.portalsdk.core.logging.aspect.MetricsLog; +import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum; @Aspect @org.springframework.context.annotation.Configuration diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/menu/MenuBuilder.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/menu/MenuBuilder.java index 9bd8f44d..94adae27 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/menu/MenuBuilder.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/menu/MenuBuilder.java @@ -44,7 +44,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; import org.onap.portalsdk.core.domain.MenuData; import org.onap.portalsdk.core.service.DataAccessService; import org.onap.portalsdk.core.util.SystemProperties; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/objectcache/support/FusionCacheManager.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/objectcache/support/FusionCacheManager.java index af8b24b7..9378f9ea 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/objectcache/support/FusionCacheManager.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/objectcache/support/FusionCacheManager.java @@ -39,7 +39,7 @@ package org.onap.portalsdk.core.objectcache.support; import java.io.IOException; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; public interface FusionCacheManager extends FusionObject { diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/AuditServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/AuditServiceImpl.java index 68cbe11c..17e6954f 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/AuditServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/AuditServiceImpl.java @@ -40,10 +40,10 @@ package org.onap.portalsdk.core.service; import java.util.Map; import org.onap.portalsdk.core.domain.AuditLog; +import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; @Service("auditService") @Transactional diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/DataAccessServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/DataAccessServiceImpl.java index 8fce7e89..95b15753 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/DataAccessServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/DataAccessServiceImpl.java @@ -65,6 +65,7 @@ import org.springframework.transaction.annotation.Transactional; /** * Provides implementations of methods in {@link DataAccessService}. */ +@SuppressWarnings("deprecation") @Transactional public class DataAccessServiceImpl extends FusionService implements DataAccessService { diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LdapServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LdapServiceImpl.java index 9f078403..741f2e1b 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LdapServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LdapServiceImpl.java @@ -51,6 +51,7 @@ import javax.naming.directory.SearchControls; import org.onap.portalsdk.core.command.support.SearchResult; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.domain.support.DomainVo; +import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.service.support.FusionService; import org.onap.portalsdk.core.service.support.ServiceLocator; @@ -58,7 +59,6 @@ import org.onap.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; @Service("ldapService") @Transactional diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java index 4b31596d..b7d00369 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java @@ -71,7 +71,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS @Autowired private UserService userService; - + private static String portalApiVersion = "/v1"; @Override @@ -159,7 +159,6 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS logger.debug(EELFLoggerDelegate.debugLogger, "createUser: " + user.getOrgUserId()); User user1 = new User(); user1.setEmail(user.getEmail()); - user1.setEmail(user.getEmail()); user1.setFirstName(user.getFirstName()); user1.setHrid(user.getHrid()); user1.setJobTitle(user.getJobTitle()); @@ -212,7 +211,8 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS } private User findUser(LoginBean bean) throws IOException { - String repsonse = restApiRequestBuilder.getViaREST(portalApiVersion+"/user/" + bean.getUserid(), true, bean.getUserid()); + String repsonse = restApiRequestBuilder.getViaREST(portalApiVersion + "/user/" + bean.getUserid(), true, + bean.getUserid()); User user = userService.userMapper(repsonse); user.setId(getUserIdByOrgUserId(user.getOrgUserId())); return user; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceImpl.java index 840c6063..64525902 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceImpl.java @@ -48,6 +48,7 @@ import java.util.Set; import org.onap.portalsdk.core.command.LoginBean; import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.menu.MenuBuilder; import org.onap.portalsdk.core.service.support.FusionService; @@ -56,7 +57,6 @@ import org.onap.portalsdk.core.web.support.AppUtils; import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; @Transactional @MetricsLog diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java index 1f2a3e8f..9a01d020 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java @@ -43,11 +43,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.onap.portalsdk.core.FusionObject.Parameters; import org.onap.portalsdk.core.command.PostSearchBean; import org.onap.portalsdk.core.domain.Lookup; import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.domain.FusionObject.Parameters; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ProfileServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ProfileServiceImpl.java index f91cf2eb..5c646a92 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ProfileServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ProfileServiceImpl.java @@ -42,9 +42,9 @@ import java.util.List; import org.onap.portalsdk.core.dao.ProfileDao; import org.onap.portalsdk.core.domain.Profile; import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; @Transactional @MetricsLog diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceImpl.java index cfb1c34a..38607e28 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceImpl.java @@ -49,10 +49,10 @@ import javax.sql.DataSource; import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.RoleFunction; +import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; @Transactional @MetricsLog diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java index 646581ae..6f9cba5f 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java @@ -51,7 +51,6 @@ import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.RoleFunction; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.domain.UserApp; -import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/FusionService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/FusionService.java index da043820..32045a8c 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/FusionService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/FusionService.java @@ -37,7 +37,7 @@ */ package org.onap.portalsdk.core.service.support; -import org.onap.portalsdk.core.FusionObject; +import org.onap.portalsdk.core.domain.FusionObject; public class FusionService implements FusionObject { /** Logger for this class and subclasses */ diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SystemProperties.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SystemProperties.java index b6b03a44..b6b2cf42 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SystemProperties.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SystemProperties.java @@ -264,6 +264,10 @@ public class SystemProperties { public static final String LEFT_MENU_PARENT = "parentList"; public static final String LEFT_MENU_CHILDREND = "childItemList"; public static final String COOKIE_DOMAIN = "cookie_domain"; + + // eCOMP Portal host name + public static final String ECOMP_PORTAL_HOST_NAME = "ecomp_portal_host_name"; + public static final String ECOMP_PORTAL_SERVER_PORT = "ecomp_portal_server_port"; public enum RESULT_ENUM { diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/AppUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/AppUtils.java index 135fb4cf..c20c6afe 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/AppUtils.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/AppUtils.java @@ -45,6 +45,7 @@ import javax.servlet.http.HttpSession; import javax.sql.DataSource; import org.hibernate.Session; +import org.onap.portalsdk.core.domain.Lookup; import org.onap.portalsdk.core.exception.SessionExpiredException; import org.onap.portalsdk.core.objectcache.AbstractCacheManager; import org.onap.portalsdk.core.service.DataAccessService; @@ -160,13 +161,13 @@ public class AppUtils { return ""; } - List<org.onap.portalsdk.core.domain.Lookup> lstResult = getLookupListNoCache(dbTable, dbValueCol, dbLabelCol, + List<Lookup> lstResult = getLookupListNoCache(dbTable, dbValueCol, dbLabelCol, dbLabelCol + "='" + label.replaceAll("'", "''") + "'", ""); if (lstResult == null) { return ""; } if (!lstResult.isEmpty()) { - return ((org.onap.portalsdk.core.domain.Lookup) lstResult.toArray()[0]).getValue(); + return ((Lookup) lstResult.toArray()[0]).getValue(); } else { return ""; } @@ -180,7 +181,7 @@ public class AppUtils { Iterator i = lookupList.iterator(); while (i.hasNext()) { - org.onap.portalsdk.core.domain.Lookup lookup = (org.onap.portalsdk.core.domain.Lookup) i.next(); + Lookup lookup = (Lookup) i.next(); if (lookup.getLabel().equals(label)) { return lookup.getValue(); } diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/dao/ProfileDaoImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/dao/ProfileDaoImplTest.java index 3de08cb4..94230185 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/dao/ProfileDaoImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/dao/ProfileDaoImplTest.java @@ -43,7 +43,6 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AppTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AppTest.java deleted file mode 100644 index 8deaf877..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AppTest.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class AppTest { - - public App mockApp() { - App app = new App(); - app.setName("testApp"); - app.setImageUrl("testmageUrl"); - app.setDescription("testdescription"); - app.setNotes("testNotes"); - app.setUrl("testUrl"); - app.setAlternateUrl("testAlternateUrl"); - app.setRestEndpoint("testRestEndpoint"); - app.setMlAppName("testMlAppName"); - app.setMlAppAdminId("testMlAppAdminId"); - app.setMotsId("testMotsId"); - app.setAppPassword("testAppPassword"); - app.setOpen("testOpen"); - app.setEnabled("testEnabled"); - app.setThumbnail(null); - app.setUsername("testUsername"); - app.setUebKey("testUebKey"); - app.setUebSecret("testUebSecret"); - app.setUebTopicName("testuebTopicName"); - return app; - } - - @Test - public void appTest() - { - App mockApp = mockApp(); - App app = new App(); - app.setName("testApp"); - app.setImageUrl("testmageUrl"); - app.setDescription("testdescription"); - app.setNotes("testNotes"); - app.setUrl("testUrl"); - app.setAlternateUrl("testAlternateUrl"); - app.setRestEndpoint("testRestEndpoint"); - app.setMlAppName("testMlAppName"); - app.setMlAppAdminId("testMlAppAdminId"); - app.setMotsId("testMotsId"); - app.setAppPassword("testAppPassword"); - app.setOpen("testOpen"); - app.setEnabled("testEnabled"); - app.setThumbnail(null); - app.setUsername("testUsername"); - app.setUebKey("testUebKey"); - app.setUebSecret("testUebSecret"); - app.setUebTopicName("testuebTopicName"); - - assertEquals(app.getName(), mockApp.getName()); - assertEquals(app.getImageUrl(), mockApp.getImageUrl()); - assertEquals(app.getDescription(), mockApp.getDescription()); - assertEquals(app.getNotes(), mockApp.getNotes()); - assertEquals(app.getUrl(), mockApp.getUrl()); - assertEquals(app.getAlternateUrl(), mockApp.getAlternateUrl()); - assertEquals(app.getRestEndpoint(), mockApp.getRestEndpoint()); - assertEquals(app.getMlAppName(), mockApp.getMlAppName()); - assertEquals(app.getMlAppAdminId(), mockApp.getMlAppAdminId()); - assertEquals(app.getMotsId(), mockApp.getMotsId()); - assertEquals(app.getOpen(), mockApp.getOpen()); - assertEquals(app.getEnabled(), mockApp.getEnabled()); - assertEquals(app.getThumbnail(), mockApp.getThumbnail()); - assertEquals(app.getUsername(), mockApp.getUsername()); - assertEquals(app.getUebKey(), mockApp.getUebKey()); - assertEquals(app.getUebSecret(), mockApp.getUebSecret()); - assertEquals(app.getUebTopicName(), mockApp.getUebTopicName()); - assertEquals(app.getAppPassword(), mockApp.getAppPassword()); - - } - - @Test - public void compareToTest() - { - App app = new App(); - app.setId((long) 1); - int result = app.compareTo(app); - assertEquals(result, 0); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AuditLogTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AuditLogTest.java deleted file mode 100644 index 8b43053e..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/AuditLogTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class AuditLogTest { - - public AuditLog mockAuditLog() - { - AuditLog auditLog = new AuditLog(); - auditLog.setActivityCode("activityCode"); - auditLog.setAffectedRecordId("affectedRecordId"); - auditLog.setComments("comments"); - auditLog.setAuditDate(null); - auditLog.setUserId((long) 1); - return auditLog; - } - - @Test - public void auditLogTest() - { - AuditLog mockAuditLog = mockAuditLog(); - AuditLog auditLog = new AuditLog(); - auditLog.setActivityCode("activityCode"); - auditLog.setAffectedRecordId("affectedRecordId"); - auditLog.setComments("comments"); - auditLog.setAuditDate(null); - auditLog.setUserId((long) 1); - assertEquals(auditLog.getActivityCode(), mockAuditLog.getActivityCode()); - assertEquals(auditLog.getAffectedRecordId(), mockAuditLog.getAffectedRecordId()); - assertEquals(auditLog.getComments(), mockAuditLog.getComments()); - assertEquals(auditLog.getAuditDate(), mockAuditLog.getAuditDate()); - assertEquals(auditLog.getUserId(), mockAuditLog.getUserId()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/BroadcastMessageTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/BroadcastMessageTest.java deleted file mode 100644 index 6174a413..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/BroadcastMessageTest.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class BroadcastMessageTest { - - public BroadcastMessage mockBroadcastMessage() { - BroadcastMessage broadcastMessage = new BroadcastMessage(); - broadcastMessage.setMessageText("messageText"); - broadcastMessage.setLocationId(1); - broadcastMessage.setStartDate(null); - broadcastMessage.setEndDate(null); - broadcastMessage.setSortOrder(1); - broadcastMessage.setActive(false); - broadcastMessage.setSiteCd("siteCd"); - return broadcastMessage; - } - - @Test - public void broadcastMessageTest() { - BroadcastMessage mockBroadcastMessage = mockBroadcastMessage(); - BroadcastMessage broadcastMessage = new BroadcastMessage(); - broadcastMessage.setMessageText("messageText"); - broadcastMessage.setLocationId(1); - broadcastMessage.setStartDate(null); - broadcastMessage.setEndDate(null); - broadcastMessage.setSortOrder(1); - broadcastMessage.setActive(false); - broadcastMessage.setSiteCd("siteCd"); - assertEquals(broadcastMessage.getMessageText(), mockBroadcastMessage.getMessageText()); - assertEquals(broadcastMessage.getLocationId(), mockBroadcastMessage.getLocationId()); - assertEquals(broadcastMessage.getStartDate(), mockBroadcastMessage.getStartDate()); - assertEquals(broadcastMessage.getEndDate(), mockBroadcastMessage.getEndDate()); - assertEquals(broadcastMessage.getSortOrder(), mockBroadcastMessage.getSortOrder()); - assertEquals(broadcastMessage.getActive(), mockBroadcastMessage.getActive()); - assertEquals(broadcastMessage.getSiteCd(), mockBroadcastMessage.getSiteCd()); - } - - @Test - public void compareToTest() - { - BroadcastMessage broadcastMessage = new BroadcastMessage(); - broadcastMessage.setLocationId(1); - broadcastMessage.setSortOrder(1); - broadcastMessage.setId((long) 2); - int result = broadcastMessage.compareTo(broadcastMessage); - assertEquals(result, 0); - } - - @Test - public void compareToDiffTest() - { - BroadcastMessage broadcastMessage = new BroadcastMessage(); - BroadcastMessage broadcastMessage1 = new BroadcastMessage(); - broadcastMessage.setLocationId(0); - broadcastMessage1.setLocationId(1); - broadcastMessage.setSortOrder(1); - broadcastMessage.setId((long) 2); - int result = broadcastMessage1.compareTo(broadcastMessage); - assertEquals(result, 1); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/FnMenuTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/FnMenuTest.java deleted file mode 100644 index 0c57a2d4..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/FnMenuTest.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class FnMenuTest { - - public FnMenu mockFnMenuTest() { - FnMenu fnMenu = new FnMenu(); - fnMenu.setMenuId(1); - fnMenu.setLabel("label"); - fnMenu.setParentId(1); - fnMenu.setAction("action"); - fnMenu.setFunctionCd("functionCd"); - fnMenu.setSortOrder(1); - fnMenu.setServlet("servlet"); - fnMenu.setQueryString("queryString"); - fnMenu.setExternalUrl("externalUrl"); - fnMenu.setTarget("target"); - fnMenu.setActive("active"); - fnMenu.setSeparator("separator"); - fnMenu.setImageSrc("imageSrc"); - fnMenu.setMenuSetCode("menuSetCode"); - return fnMenu; - } - - @Test - public void fnMenuTest() { - FnMenu mockFnMenu = mockFnMenuTest(); - FnMenu fnMenu = new FnMenu(); - fnMenu.setMenuId(1); - fnMenu.setLabel("label"); - fnMenu.setParentId(1); - fnMenu.setAction("action"); - fnMenu.setFunctionCd("functionCd"); - fnMenu.setSortOrder(1); - fnMenu.setServlet("servlet"); - fnMenu.setQueryString("queryString"); - fnMenu.setExternalUrl("externalUrl"); - fnMenu.setTarget("target"); - fnMenu.setActive("active"); - fnMenu.setSeparator("separator"); - fnMenu.setImageSrc("imageSrc"); - fnMenu.setMenuSetCode("menuSetCode"); - assertEquals(fnMenu.getMenuId(), mockFnMenu.getMenuId()); - assertEquals(fnMenu.getLabel(), mockFnMenu.getLabel()); - assertEquals(fnMenu.getParentId(), mockFnMenu.getParentId()); - assertEquals(fnMenu.getAction(), mockFnMenu.getAction()); - assertEquals(fnMenu.getSortOrder(), mockFnMenu.getSortOrder()); - assertEquals(fnMenu.getServlet(), mockFnMenu.getServlet()); - assertEquals(fnMenu.getQueryString(), mockFnMenu.getQueryString()); - assertEquals(fnMenu.getExternalUrl(), mockFnMenu.getExternalUrl()); - assertEquals(fnMenu.getTarget(), mockFnMenu.getTarget()); - assertEquals(fnMenu.getActive(), mockFnMenu.getActive()); - assertEquals(fnMenu.getSeparator(), mockFnMenu.getSeparator()); - assertEquals(fnMenu.getImageSrc(), mockFnMenu.getImageSrc()); - assertEquals(fnMenu.getMenuSetCode(), mockFnMenu.getMenuSetCode()); - assertEquals(fnMenu.getFunctionCd(), mockFnMenu.getFunctionCd()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LoginBeanTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LoginBeanTest.java deleted file mode 100644 index 7d4fbef2..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LoginBeanTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class LoginBeanTest { - - public LoginBean mockLoginBean() { - LoginBean loginBean = new LoginBean(); - loginBean.setLoginId("loginId"); - loginBean.setLoginPwd("loginPwd"); - loginBean.setHrid("hrid"); - loginBean.setOrgUserId("orgUserId"); - loginBean.setSiteAccess("siteAccess"); - loginBean.setLoginErrorMessage("loginErrorMessage"); - loginBean.setUser(null); - loginBean.setMenu(null); - loginBean.setBusinessDirectMenu(null); - return loginBean; - } - - @Test - public void loginBeanTest() { - LoginBean mockLoginBean = mockLoginBean(); - LoginBean loginBean = new LoginBean(); - loginBean.setLoginId("loginId"); - loginBean.setLoginPwd("loginPwd"); - loginBean.setHrid("hrid"); - loginBean.setOrgUserId("orgUserId"); - loginBean.setSiteAccess("siteAccess"); - loginBean.setLoginErrorMessage("loginErrorMessage"); - loginBean.setUser(null); - loginBean.setMenu(null); - loginBean.setBusinessDirectMenu(null); - assertEquals(loginBean.getLoginId(), mockLoginBean.getLoginId()); - assertEquals(loginBean.getLoginPwd(), mockLoginBean.getLoginPwd()); - assertEquals(loginBean.getHrid(), mockLoginBean.getHrid()); - assertEquals(loginBean.getOrgUserId(), mockLoginBean.getOrgUserId()); - assertEquals(loginBean.getSiteAccess(), mockLoginBean.getSiteAccess()); - assertEquals(loginBean.getLoginErrorMessage(), mockLoginBean.getLoginErrorMessage()); - assertEquals(loginBean.getUser(), mockLoginBean.getUser()); - assertEquals(loginBean.getMenu(), mockLoginBean.getMenu()); - assertEquals(loginBean.getBusinessDirectMenu(), mockLoginBean.getBusinessDirectMenu()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LookupTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LookupTest.java deleted file mode 100644 index 9dcd43f7..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LookupTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.NameValueId; - -public class LookupTest { - - public Lookup mockLookUp() { - Lookup lookup = new Lookup(); - NameValueId nameValueId = new NameValueId(); - nameValueId.setLab("label"); - nameValueId.setVal("value"); - lookup.setLabel(nameValueId.getLab()); - lookup.setValue(nameValueId.getVal()); - lookup.setNameValueId(nameValueId); - return lookup; - } - - @Test - public void lookupTest() { - Lookup lookup = mockLookUp(); - Lookup lookup1 = new Lookup("label", "value"); - assertEquals(lookup.getLabel(), "label"); - assertEquals(lookup.getValue(), "value"); - assertEquals(lookup, lookup1); - assertNotNull(lookup.hashCode()); - assertTrue(lookup.equals(lookup1)); - Lookup lookup2 = null; - assertFalse(lookup.equals(lookup2)); - NameValueId nameValueId = new NameValueId(); - assertFalse(lookup.equals(nameValueId)); - assertEquals(lookup.getNameValueId().getLab(), lookup1.getNameValueId().getLab()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuCountryTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuCountryTest.java deleted file mode 100644 index a5afc07d..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuCountryTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class LuCountryTest { - - public LuCountry mockLuCountry() { - LuCountry luCountry = new LuCountry(); - luCountry.setAbbr("abbr"); - luCountry.setCountry("country"); - luCountry.setFullName("fullName"); - luCountry.setWebphoneCountryLabel("webphoneCountryLabel"); - return luCountry; - } - - @Test - public void luCountryTest() { - LuCountry mockluCountry = mockLuCountry(); - LuCountry luCountry = new LuCountry(); - luCountry.setAbbr("abbr"); - luCountry.setCountry("country"); - luCountry.setFullName("fullName"); - luCountry.setWebphoneCountryLabel("webphoneCountryLabel"); - assertEquals(luCountry.getAbbr(), mockluCountry.getAbbr()); - assertEquals(luCountry.getCountry(), mockluCountry.getCountry()); - assertEquals(luCountry.getFullName(), mockluCountry.getFullName()); - assertEquals(luCountry.getWebphoneCountryLabel(), mockluCountry.getWebphoneCountryLabel()); - } - - @Test - public void compareToTest() - { - LuCountry mockluCountry = mockLuCountry(); - LuCountry luCountry = new LuCountry(); - luCountry.setCountry("test"); - assertEquals(mockluCountry.compareTo(luCountry),-17); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuStateTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuStateTest.java deleted file mode 100644 index 902d9cee..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuStateTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class LuStateTest { - - public LuState mockLuState() { - LuState luState = new LuState(); - luState.setAbbr("abbr"); - luState.setState("state"); - return luState; - } - - @Test - public void luStateTest() { - LuState mockluState = mockLuState(); - LuState luState = new LuState(); - luState.setAbbr("abbr"); - luState.setState("state"); - assertEquals(mockluState.getAbbr(), luState.getAbbr()); - assertEquals(mockluState.getState(), luState.getState()); - LuState luState1 = new LuState(); - luState1.setState("stateTest"); - assertEquals(luState.compareTo(luState1), -4); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuTimeZoneTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuTimeZoneTest.java deleted file mode 100644 index cf5f9369..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/LuTimeZoneTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class LuTimeZoneTest { - - public LuTimeZone mockLuTimeZone() { - LuTimeZone luTimeZone = new LuTimeZone(); - luTimeZone.setName("name"); - luTimeZone.setTimezoneId((long) 1); - luTimeZone.setValue("value"); - return luTimeZone; - } - - @Test - public void luTimeZone() - { - LuTimeZone luTimeZone = mockLuTimeZone(); - LuTimeZone luTimeZone1 = mockLuTimeZone(); - assertEquals(luTimeZone.getName(), luTimeZone1.getName()); - assertEquals(luTimeZone.getValue(), luTimeZone1.getValue()); - assertEquals(luTimeZone.getTimezoneId(), luTimeZone1.getTimezoneId()); - assertEquals(luTimeZone.getId(), null); - luTimeZone.setId((long) 1); - luTimeZone1.setId((long) 2); - assertTrue(luTimeZone.compareTo(luTimeZone1) == -1); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuDataTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuDataTest.java deleted file mode 100644 index 2b16c9ef..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuDataTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class MenuDataTest { - - public MenuData mockMenuTest() { - MenuData menuData = new MenuData(); - menuData.setParentMenu(null); - menuData.setChildMenus(null); - return menuData; - } - - @Test - public void menuDataTest() { - MenuData menuData = mockMenuTest(); - assertNull(menuData.getParentMenu()); - assertNull(menuData.getChildMenus()); - assertEquals(menuData.getActiveAsString(), "false"); - assertEquals(menuData.getParentIdAsString(), "null"); - assertEquals(menuData.getSeparatorAsString(), "false"); - MenuData menuData1 = mockMenuTest(); - menuData1.setSortOrder(null); - assertTrue(menuData1.compareTo(menuData) == 1); - menuData1.setSortOrder((short) 1); - menuData.setSortOrder(null); - assertTrue(menuData1.compareTo(menuData) == 1); - menuData.setSortOrder((short) 1); - assertTrue(menuData1.compareTo(menuData) == 1); - menuData.setSortOrder((short) 2); - assertTrue(menuData1.compareTo(menuData) == -1); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuTest.java deleted file mode 100644 index ece93c87..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/MenuTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class MenuTest { - - public Menu mockMenu() { - Menu menu = new Menu(); - menu.setMenuLevel("menuLevel"); - menu.setLabel("label"); - menu.setParentId((long) 1); - menu.setAction("action"); - menu.setFunctionCd("functionCd"); - menu.setSortOrder((short) 1); - menu.setServlet("servlet"); - menu.setQueryString("queryString"); - menu.setExternalUrl("externalUrl"); - menu.setTarget("target"); - menu.setActive(false); - menu.setMenuSetCode("menuSetCode"); - menu.setSeparator(false); - menu.setImageSrc("imageSrc"); - return menu; - } - - @Test - public void menuTest() { - Menu menu = mockMenu(); - Menu menu1 = mockMenu(); - assertEquals(menu.getMenuLevel(), menu1.getMenuLevel()); - assertEquals(menu.getLabel(), menu1.getLabel()); - assertEquals(menu.getParentId(), menu1.getParentId()); - assertEquals(menu.getAction(), menu1.getAction()); - assertEquals(menu.getFunctionCd(), menu1.getFunctionCd()); - assertEquals(menu.getSortOrder(), menu1.getSortOrder()); - assertEquals(menu.getServlet(), menu1.getServlet()); - assertEquals(menu.getQueryString(), menu1.getQueryString()); - assertEquals(menu.getExternalUrl(), menu1.getExternalUrl()); - assertEquals(menu.getTarget(), menu1.getTarget()); - assertEquals(menu.isActive(), menu1.isActive()); - assertEquals(menu.getMenuSetCode(), menu1.getMenuSetCode()); - assertEquals(menu.isSeparator(), menu1.isSeparator()); - assertEquals(menu.getImageSrc(), menu1.getImageSrc()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/ProfileTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/ProfileTest.java deleted file mode 100644 index aab449a4..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/ProfileTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class ProfileTest { - - public Profile mockProfile() { - Profile profile = new Profile(); - profile.setId((long) 1); - profile.setFirst_name("first_name"); - profile.setLast_name("last_name"); - profile.setEmail("email"); - profile.setOrgManagerUserId("orgManagerUserId"); - profile.setActive_yn("active_yn"); - profile.setOrgUserId("orgUserId"); - return profile; - } - - @Test - public void profileTest() { - Profile profile = mockProfile(); - Profile profile1 = mockProfile(); - assertEquals(profile.getId(), profile1.getId()); - assertEquals(profile.getFirst_name(), profile1.getFirst_name()); - assertEquals(profile.getLast_name(), profile1.getLast_name()); - assertEquals(profile.getEmail(), profile1.getEmail()); - assertEquals(profile.getOrgManagerUserId(), profile1.getOrgManagerUserId()); - assertEquals(profile.getActive_yn(), profile1.getActive_yn()); - assertEquals(profile.getOrgUserId(), profile1.getOrgUserId()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleFunctionTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleFunctionTest.java deleted file mode 100644 index 82f62fa2..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleFunctionTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class RoleFunctionTest { - - public RoleFunction mockRoleFunction() { - RoleFunction roleFunction = new RoleFunction(); - roleFunction.setCode("code"); - roleFunction.setName("name"); - return roleFunction; - } - - @Test - public void rolefunctionTest() { - RoleFunction roleFunction = mockRoleFunction(); - RoleFunction roleFunction1 = mockRoleFunction(); - assertEquals(roleFunction.getCode(), roleFunction1.getCode()); - assertEquals(roleFunction.getName(), roleFunction1.getName()); - assertEquals(roleFunction.getEditUrl(), roleFunction1.getEditUrl()); - roleFunction1.setName(null); - assertTrue(roleFunction.compareTo(roleFunction1) == 1); - RoleFunction roleFunction2 = mockRoleFunction(); - roleFunction2.setName(null); - RoleFunction roleFunction3 = mockRoleFunction(); - assertTrue(roleFunction2.compareTo(roleFunction3) == 1); - assertTrue(roleFunction.compareTo(roleFunction3) == 0); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleTest.java deleted file mode 100644 index df952a07..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/RoleTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Set; -import java.util.TreeSet; - -import org.junit.Test; - -public class RoleTest { - - public Role mockRole() { - Role role = new Role(); - role.setName("test"); - role.setActive(false); - role.setPriority(1); - Set roleFunctions = new TreeSet<>(); - RoleFunction roleFunction = new RoleFunction(); - roleFunction.setCode("code"); - roleFunction.setName("name"); - roleFunctions.add(roleFunction); - role.setRoleFunctions(roleFunctions); - Set roles = new TreeSet<>(); - Role newrole = new Role(); - role.setChildRoles(roles); - role.setParentRoles(roles); - return role; - } - - @Test - public void roleTest() { - Role role = mockRole(); - Role role1 = mockRole(); - assertEquals(role.getName(), role1.getName()); - assertEquals(role.getActive(), role1.getActive()); - assertEquals(role.getRoleFunctions().size(), role1.getRoleFunctions().size()); - assertEquals(role.getParentRoles(), role1.getParentRoles()); - assertEquals(role.getChildRoles(), role1.getChildRoles()); - assertEquals(role.getPriority(), role1.getPriority()); - RoleFunction roleFunction = new RoleFunction(); - roleFunction.setCode("code1"); - roleFunction.setName("name1"); - role.addRoleFunction(roleFunction); - Role parentrole = new Role(); - parentrole.setId((long) 1); - role.addParentRole(parentrole); - Role childrole = new Role(); - childrole.setId((long) 2); - role.addChildRole(childrole); - assertEquals(role.getToggleActiveAltText(), "Click to Activate Role"); - assertEquals(role.getToggleActiveImage(), "/static/fusion/images/inactive.png"); - role.removeChildRole((long) 2); - role.removeParentRole((long) 1); - role.removeRoleFunction("code1"); - role.setActive(true); - assertEquals(role.getToggleActiveImage(), "/static/fusion/images/active.png"); - assertEquals(role.getToggleActiveAltText(), "Click to Deactivate Role"); - assertEquals(role.getEditUrl(),"/role.htm?role_id=null"); - } - - @Test - public void compareToTest() { - Role role = mockRole(); - role.setName(null); - Role role1 = mockRole(); - assertTrue(role.compareTo(role1) == 1); - role.setName("test"); - role1.setName(null); - assertTrue(role.compareTo(role1) == 1); - role1.setName("test"); - assertTrue(role.compareTo(role1) == 0); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleKeyTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleKeyTest.java deleted file mode 100644 index c9864e0b..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleKeyTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class UrlsAccessibleKeyTest { - - public UrlsAccessibleKey mockUrlsAccessibleKey() { - UrlsAccessibleKey urlsAccessibleKey = new UrlsAccessibleKey(); - urlsAccessibleKey.setUrl("url"); - urlsAccessibleKey.setFunctionCd("functionCd"); - return urlsAccessibleKey; - } - - @Test - public void urlsAccessibleKeyTest() { - UrlsAccessibleKey mockurlsAccessibleKey = mockUrlsAccessibleKey(); - UrlsAccessibleKey urlsAccessibleKey = new UrlsAccessibleKey("url", "functionCd"); - assertEquals(urlsAccessibleKey.getUrl(), mockurlsAccessibleKey.getUrl()); - assertEquals(urlsAccessibleKey.getFunctionCd(), mockurlsAccessibleKey.getFunctionCd()); - } - - @Test - public void equalsandHashCodetest() { - UrlsAccessibleKey mockurlsAccessibleKey = mockUrlsAccessibleKey(); - UrlsAccessibleKey mockurlsAccessibleKey1 = mockUrlsAccessibleKey(); - UrlsAccessibleKey urlsAccessibleKey = mockurlsAccessibleKey; - assertTrue(mockurlsAccessibleKey.equals(urlsAccessibleKey)); - assertFalse(mockurlsAccessibleKey.equals(null)); - User user = new User(); - assertFalse(mockurlsAccessibleKey.equals(user)); - assertTrue(mockurlsAccessibleKey.equals(mockurlsAccessibleKey1)); - UrlsAccessibleKey mockurlsAccessibleKey2 = new UrlsAccessibleKey("test", "test"); - assertFalse(mockurlsAccessibleKey2.equals(mockurlsAccessibleKey1)); - UrlsAccessibleKey mockurlsAccessibleKey3 = new UrlsAccessibleKey("url", "test"); - assertFalse(mockurlsAccessibleKey3.equals(mockurlsAccessibleKey1)); - assertNotNull(mockurlsAccessibleKey2.hashCode()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleTest.java deleted file mode 100644 index f02e1c22..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UrlsAccessibleTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class UrlsAccessibleTest { - - public UrlsAccessible mockUrlsAccessible() { - UrlsAccessible urlsAccessible = new UrlsAccessible(); - UrlsAccessibleKey urlsAccessibleKey = new UrlsAccessibleKey(); - urlsAccessibleKey.setUrl("url"); - urlsAccessibleKey.setFunctionCd("functionCd"); - urlsAccessible.setUrlsAccessibleKey(urlsAccessibleKey); - return urlsAccessible; - } - - @Test - public void urlsAccessibleTest() { - UrlsAccessible urlsAccessible = mockUrlsAccessible(); - UrlsAccessible urlsAccessible1 = new UrlsAccessible("url", "functionCd"); - assertEquals(urlsAccessible.getUrlsAccessibleKey(), urlsAccessible1.getUrlsAccessibleKey()); - assertEquals(urlsAccessible.getUrl(), urlsAccessible1.getUrl()); - assertEquals(urlsAccessible.getFunctionCd(), urlsAccessible1.getFunctionCd()); - assertNotNull(urlsAccessible.hashCode()); - } - - @Test - public void equlasTest() { - UrlsAccessible urlsAccessible = mockUrlsAccessible(); - UrlsAccessible urlsAccessible1 = mockUrlsAccessible(); - User user = new User(); - assertFalse(urlsAccessible.equals(null)); - assertFalse(urlsAccessible.equals(user)); - assertTrue(urlsAccessible.equals(urlsAccessible1)); - - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppIdTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppIdTest.java deleted file mode 100644 index 5a057f9f..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppIdTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class UserAppIdTest { - - - public UserAppId mockUserAppId() { - UserAppId userAppId = new UserAppId(); - Role role = new Role(); - role.setId((long) 1); - App app = new App(); - app.setId((long) 1); - userAppId.setUserId((long) 1); - userAppId.setApp(app); - userAppId.setRole(role); - return userAppId; - } - - @Test - public void userAppIdTest() { - UserAppId userAppId = mockUserAppId(); - UserAppId userAppId1 = mockUserAppId(); - User user = new User(); - assertEquals(userAppId.getUserId(), userAppId1.getUserId()); - assertEquals(userAppId.getApp().getId(), userAppId1.getApp().getId()); - assertEquals(userAppId.getRole().getId(), userAppId1.getRole().getId()); - assertTrue(userAppId.equals(userAppId1)); - assertFalse(userAppId1.equals(user)); - assertFalse(userAppId1.equals(null)); - UserAppId userAppId2 = userAppId1; - assertTrue(userAppId2.equals(userAppId1)); - } - - @Test - public void hashCodeTest() { - UserAppId userAppId = mockUserAppId(); - assertNotNull(userAppId.hashCode()); - userAppId.setUserId(null); - userAppId.getApp().setId(null); - userAppId.getRole().setId(null); - assertNotNull(userAppId.hashCode()); - - - } - - -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppTest.java deleted file mode 100644 index 76704354..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserAppTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class UserAppTest { - - public UserApp mockUserApp() { - UserApp userapp = new UserApp(); - Role role = new Role(); - role.setId((long) 1); - userapp.setRole(role); - App app = new App(); - app.setId((long) 1); - userapp.setApp(app); - userapp.setUserId((long) 1); - userapp.setPriority(null); - return userapp; - } - - @Test - public void userAppTest() { - UserApp userapp1 = mockUserApp(); - UserApp userapp2 = mockUserApp(); - userapp2.setUserId((long) 2); - assertNull(userapp1.getPriority()); - assertEquals(userapp2.compareTo(userapp1), 1); - assertNotNull(userapp1.hashCode()); - userapp2.setUserId((long) 1); - assertTrue(userapp1.equals(userapp2)); - User user = new User(); - assertFalse(userapp2.equals(user)); - assertFalse(user.equals(null)); - UserApp userapp3 = userapp2; - assertTrue(userapp3.equals(userapp2)); - } - - - @Test - public void hashCodeTest() { - UserApp userapp1 = mockUserApp(); - assertNotNull(userapp1.hashCode()); - userapp1.setUserId(null); - userapp1.getApp().setId(null); - userapp1.getRole().setId(null); - userapp1.setPriority(null); - assertNotNull(userapp1.hashCode()); - - - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserTest.java deleted file mode 100644 index 7dee9529..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/UserTest.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * ============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.domain; - -import static org.junit.Assert.*; - -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.Test; - -public class UserTest { - - public User mockUser() - { - User user = new User(); - user.setOrgId((long) 1); - user.setManagerId((long) 12); - user.setFirstName("firstName"); - user.setMiddleInitial("middleInitial"); - user.setLastName("lastName"); - user.setPhone("phone"); - user.setFax("fax"); - user.setCellular("cellular"); - user.setEmail("email"); - user.setAddressId((long) 1); - user.setAlertMethodCd("alertMethodCd"); - user.setHrid("hrid"); - user.setOrgUserId("orgUserId"); - user.setOrgCode("orgCode"); - user.setAddress1("address1"); - user.setAddress2("address2"); - user.setCity("city"); - user.setState("state"); - user.setZipCode("zipCode"); - user.setCountry("country"); - user.setOrgManagerUserId("orgManagerUserId"); - user.setLocationClli("locationClli"); - user.setBusinessCountryCode("businessCountryCode"); - user.setBusinessCountryName("businessCountryName"); - user.setBusinessUnit("businessUnit"); - user.setBusinessUnitName("businessUnitName"); - user.setDepartment("department"); - user.setDepartmentName("departmentName"); - user.setCompanyCode("companyCode"); - user.setCompany("company"); - user.setZipCodeSuffix("zipCodeSuffix"); - user.setJobTitle("jobTitle"); - user.setCommandChain("commandChain"); - user.setSiloStatus("siloStatus"); - user.setCostCenter("costCenter"); - user.setFinancialLocCode("financialLocCode"); - user.setLoginId("loginId"); - user.setLoginPwd("loginPwd"); - user.setLastLoginDate(null); - user.setActive(false); - user.setInternal(false); - user.setSelectedProfileId((long) 1); - user.setTimeZoneId((long) 1); - user.setChatId("chatId"); - user.setUserApps(null); - user.setPseudoRoles(null); - user.setOnline(false); - return user; - } - - @Test - public void userTest() - { - User mockUser = mockUser(); - User user = mockUser(); - assertEquals(user.getOrgId(), mockUser.getOrgId()); - assertEquals(user.getManagerId(), mockUser.getManagerId()); - assertEquals(user.getFirstName(), mockUser.getFirstName()); - assertEquals(user.getMiddleInitial(), mockUser.getMiddleInitial()); - assertEquals(user.getLastName(), mockUser.getLastName()); - assertEquals(user.getPhone(), mockUser.getPhone()); - assertEquals(user.getFax(), mockUser.getFax()); - assertEquals(user.getCellular(), mockUser.getCellular()); - assertEquals(user.getEmail(), mockUser.getEmail()); - assertEquals(user.getAddressId(), mockUser.getAddressId()); - assertEquals(user.getAlertMethodCd(), mockUser.getAlertMethodCd()); - assertEquals(user.getHrid(), mockUser.getHrid()); - assertEquals(user.getOrgUserId(), mockUser.getOrgUserId()); - assertEquals(user.getOrgCode(), mockUser.getOrgCode()); - assertEquals(user.getAddress1(), mockUser.getAddress1()); - assertEquals(user.getAddress2(), mockUser.getAddress2()); - assertEquals(user.getCity(), mockUser.getCity()); - assertEquals(user.getState(), mockUser.getState()); - assertEquals(user.getZipCode(), mockUser.getZipCode()); - assertEquals(user.getCountry(), mockUser.getCountry()); - assertEquals(user.getOrgManagerUserId(), mockUser.getOrgManagerUserId()); - assertEquals(user.getLocationClli(), mockUser.getLocationClli()); - assertEquals(user.getBusinessCountryCode(), mockUser.getBusinessCountryCode()); - assertEquals(user.getBusinessCountryName(), mockUser.getBusinessCountryName()); - assertEquals(user.getBusinessUnit(), mockUser.getBusinessUnit()); - assertEquals(user.getBusinessUnitName(), mockUser.getBusinessUnitName()); - assertEquals(user.getDepartment(), mockUser.getDepartment()); - assertEquals(user.getDepartmentName(), mockUser.getDepartmentName()); - assertEquals(user.getCompanyCode(), mockUser.getCompanyCode()); - assertEquals(user.getCompany(), mockUser.getCompany()); - assertEquals(user.getZipCodeSuffix(), mockUser.getZipCodeSuffix()); - assertEquals(user.getJobTitle(), mockUser.getJobTitle()); - assertEquals(user.getCommandChain(), mockUser.getCommandChain()); - assertEquals(user.getSiloStatus(), mockUser.getSiloStatus()); - assertEquals(user.getCostCenter(), mockUser.getCostCenter()); - assertEquals(user.getFinancialLocCode(), mockUser.getFinancialLocCode()); - assertEquals(user.getLoginId(), mockUser.getLoginId()); - assertEquals(user.getLoginPwd(), mockUser.getLoginPwd()); - assertEquals(user.getLastLoginDate(), mockUser.getLastLoginDate()); - assertEquals(user.getActive(), mockUser.getActive()); - assertEquals(user.getInternal(), mockUser.getInternal()); - assertEquals(user.getSelectedProfileId(), mockUser.getSelectedProfileId()); - assertEquals(user.getTimeZoneId(), mockUser.getTimeZoneId()); - assertEquals(user.getChatId(), mockUser.getChatId()); - assertEquals(user.getUserApps(), mockUser.getUserApps()); - assertEquals(user.getPseudoRoles(), mockUser.getPseudoRoles()); - assertEquals(user.getFullName(), mockUser.getFullName()); - assertFalse(user.isOnline()); - - - } - - @Test - public void addAppRolesIfRolesNullTest() - { - User user = mockUser(); - Set userApps = new TreeSet(); - UserApp userapp = new UserApp(); - userApps.add(userapp); - user.setUserApps(userApps); - user.setUserApps(userApps); - App app = new App(); - user.addAppRoles(app, null); - } - - @Test - public void addAppRolesTest() - { - User user = mockUser(); - App app = new App(); - - SortedSet<Role> roles = new TreeSet<>(); - Role role = new Role(); - role.setId((long) 1); - role.setName("test"); - roles.add(role); - user.addAppRoles(app, roles); - } - - @SuppressWarnings("unchecked") - @Test - public void addandRemoveRoleTest() - { - User user = mockUser(); - Set userApps = new TreeSet(); - UserApp userapp = new UserApp(); - SortedSet<Role> roles = new TreeSet(); - Role role = new Role(); - role.setId((long) 1); - roles.add(role); - userapp.setRole(role); - userApps.add(userapp); - user.setUserApps(userApps); - user.removeRole((long) 1); - user.addRole(role); - user.setRoles(roles); - UserApp userapplication = user.getDefaultUserApp(); - assertTrue(userapplication.getRole().getId() == 1); - } - - @Test - public void comapreToTest() { - - User user1 = mockUser(); - User user = mockUser(); - user.setFirstName("test"); - assertEquals(user.compareTo(user1), 14); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/sessionmgt/TimeoutVOTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/sessionmgt/TimeoutVOTest.java index 30dfa083..6726876d 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/sessionmgt/TimeoutVOTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/domain/sessionmgt/TimeoutVOTest.java @@ -37,10 +37,9 @@ */ package org.onap.portalsdk.core.domain.sessionmgt; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.onap.portalsdk.core.domain.support.DomainVo; public class TimeoutVOTest { diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/PortalRestClientBaseTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/PortalRestClientBaseTest.java index 056a1190..0dc259e7 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/PortalRestClientBaseTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/PortalRestClientBaseTest.java @@ -54,7 +54,6 @@ import org.onap.portalsdk.core.domain.App; import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; -import org.onap.portalsdk.core.restful.client.PortalRestClientBase; import org.onap.portalsdk.core.service.AppService; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/SharedContextRestClientTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/SharedContextRestClientTest.java index db6cde7c..06fe521d 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/SharedContextRestClientTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/restful/client/SharedContextRestClientTest.java @@ -56,7 +56,6 @@ import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.restful.domain.SharedContext; -import org.onap.portalsdk.core.scheduler.CoreRegister; import org.onap.portalsdk.core.service.AppService; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java index 7f179f66..092585cb 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.portalsdk.core.FusionObject.Parameters; +import org.onap.portalsdk.core.domain.FusionObject.Parameters; import org.onap.portalsdk.core.domain.support.DomainVo; import org.onap.portalsdk.core.util.SystemProperties; import org.powermock.api.mockito.PowerMockito; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UrlAccessImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UrlAccessImplTest.java index f3cd7bbe..42f72603 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UrlAccessImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UrlAccessImplTest.java @@ -40,8 +40,6 @@ package org.onap.portalsdk.core.service; import java.util.ArrayList; import java.util.List; -import org.hibernate.criterion.Criterion; -import org.hibernate.criterion.Restrictions; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserProfileServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserProfileServiceImplTest.java index 565142d0..c73343d6 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserProfileServiceImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserProfileServiceImplTest.java @@ -37,19 +37,12 @@ */ package org.onap.portalsdk.core.service; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.onap.portalsdk.core.domain.User; -import org.onap.portalsdk.core.domain.support.CollaborateList; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java index 17fadcc6..df6122a1 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java @@ -43,7 +43,6 @@ import java.util.List; import java.util.Map; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/AttributeTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/AttributeTest.java deleted file mode 100644 index 16a8a597..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/AttributeTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Attribute; - -public class AttributeTest { - - private static final double DELTA = 1e-15; - - public Attribute mockAttribute(){ - Attribute attribute = new Attribute(); - - attribute.setName("test"); - attribute.setHeight(10); - attribute.setLeft(10); - attribute.setTop(10); - attribute.setWidth(10); - - return attribute; - } - - @Test - public void attributeTest(){ - Attribute attribute = mockAttribute(); - - Attribute attribute1 = new Attribute(); - attribute1.setName("test"); - attribute1.setHeight(10); - attribute1.setLeft(10); - attribute1.setTop(10); - attribute1.setWidth(10); - - assertEquals(attribute.getHeight(), attribute1.getHeight(), DELTA); - assertEquals(attribute.getName(), attribute1.getName()); - assertEquals(attribute.getLeft(), attribute1.getLeft(), DELTA); - assertEquals(attribute.getTop(), attribute1.getTop(), DELTA); - assertEquals(attribute.getWidth(), attribute1.getWidth(), DELTA); - - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/CollaborateListTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/CollaborateListTest.java deleted file mode 100644 index 4bc9f3b6..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/CollaborateListTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.CollaborateList; - -public class CollaborateListTest { - - @SuppressWarnings("static-access") - @Test - public void addAndRemoveUserListTest(){ - String user1 = "Test User1"; - String user2 = "Test User2"; - CollaborateList collaborateList = CollaborateList.getInstance(); - collaborateList.addUserName(user1); - collaborateList.addUserName(user2); - collaborateList.delUserName(user2); - - assertEquals(true, collaborateList.getAllUserName().contains(user1)); - assertEquals(false, collaborateList.getAllUserName().contains(user2)); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ContainerTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ContainerTest.java deleted file mode 100644 index 145ee58f..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ContainerTest.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.onap.portalsdk.core.domain.User; -import org.onap.portalsdk.core.domain.support.Container; -import org.onap.portalsdk.core.domain.support.Element; -import org.onap.portalsdk.core.domain.support.Position; -import org.onap.portalsdk.core.domain.support.Size; -import org.onap.portalsdk.core.restful.client.SharedContextRestClient; -import org.onap.portalsdk.core.web.support.UserUtils; - -public class ContainerTest { - - @InjectMocks - Container container = new Container(); - - @Mock - private SharedContextRestClient sharedContextRestClient; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - //MockitoTestSuite mockitoTestSuite = new MockitoTestSuite(); - - NullPointerException nullPointerException = new NullPointerException(); - - User user = new User(); - - @Mock - UserUtils userUtils = new UserUtils(); - - private static final double DELTA = 1e-15; - - public Container mockContainer(){ - Container container = new Container("test","test",1,1,10,10,10,10,10,10); - - Size size = new Size(); - size.setHeight(10); - size.setWidth(10); - - Position position = new Position(); - position.setX(10); - position.setY(10); - - Map<String, Container> containerRowCol = new HashMap<String, Container>(); - Map<String, Element> elementRowCol = new HashMap<String, Element>(); - - List<Container> innerCList = new ArrayList<Container>(); - List<Element> elementList = new ArrayList<Element>(); - - container.setName("test"); - container.setVisibilityType("test"); - container.setHeight(10); - container.setLeft(10); - container.setWidth(10); - container.setInnerContainer(null); - container.setElements(null); - container.setInnerCList(null); - container.setElementList(null); - container.setP(null); - return container; - } - - @Test - public void containerTest(){ - Container container = mockContainer(); - - Container container1 = new Container("test","test",1,1,10,10,10,10,10,10); - - Size size1 = new Size(); - size1.setHeight(10); - size1.setWidth(10); - - Position position1 = new Position(); - position1.setX(10); - position1.setY(10); - container1.setP(null); - - - container1.setName("test"); - container.setVisibilityType("test"); - container.setHeight(10); - container.setLeft(10); - container.setWidth(10); - container.setInnerContainer(null); - container.setElements(null); - container.setInnerCList(null); - container.setElementList(null); - - assertEquals(container.getContainerRowCol(), container1.getContainerRowCol()); - assertEquals(container.getElementRowCol(), container1.getElementRowCol()); - assertEquals(container.getName(), container1.getName()); - assertEquals(container.getP(), container1.getP()); - } - - @Test - public void computeSizeTest(){ - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container = new Container("test","test",1,1,10,10,10,10,10,10); - containerRowCol.put("00", container); - - Map<String, Element> elementRowCol = new HashMap<>(); - Element element = new Element("1", "test"); - elementRowCol.put("00", element); - - Container containerTest = new Container("test","Broadworks complex",1,1,10,10,10,10,10,10); - containerTest.setElements(elementRowCol); - containerTest.setInnerContainer(containerRowCol); - Size size = containerTest.computeSize(); - assertEquals(40.0,size.getWidth(), DELTA); - assertEquals(40.1, size.getHeight(), DELTA); - } - - @Test - public void computeElementPositionsTest(){ - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Container container01 = new Container("test","test",1,1,10,10,10,10,10,10); - containerRowCol.put("00", container00); - containerRowCol.put("10", container01); - containerRowCol.put("11", container01); - - Map<String, Element> elementRowCol = new HashMap<>(); - Element element = new Element("1", "test"); - elementRowCol.put("01", element); - elementRowCol.put("02", element); - - Container containerTest = new Container("test","Broadworks complex",2,3,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - containerTest.setP(position); - containerTest.setElements(elementRowCol); - containerTest.setInnerContainer(containerRowCol); - containerTest.computeElementPositions(); - assertEquals(20.0,containerTest.getContainerRowCol().get("00").getP().getX(), DELTA); - assertEquals(20.0,containerTest.getContainerRowCol().get("00").getP().getY(), DELTA); - assertEquals(50.0,containerTest.getContainerRowCol().get("11").getP().getX(), DELTA); - assertEquals(31.5,containerTest.getContainerRowCol().get("11").getP().getY(), DELTA); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainTest.java deleted file mode 100644 index ff9522df..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainTest.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Container; -import org.onap.portalsdk.core.domain.support.Domain; -import org.onap.portalsdk.core.domain.support.Size; - -public class DomainTest { - - private static final double DELTA = 1e-15; - - public Domain mockDomain(){ - - Domain domain = new Domain(null, null, 0, 0, 0, 0, 0, 0, 0); - - domain.setP(null); - domain.setNewXafterColl(0); - domain.setYafterColl(0); - domain.setDomainToLayoutWd(0); - domain.setTop(0); - domain.setLeft(0); - domain.setHeight(0); - domain.setWidth(0); - domain.setName("test"); - domain.setIndexChanged(false); - domain.setContainers(null); - - return domain; - } - - @Test - public void domainTest(){ - Domain domain = mockDomain(); - - Domain domain1 = new Domain(null, null, 0, 0, 0, 0, 0, 0, 0); - - domain1.setP(null); - domain1.setNewXafterColl(0); - domain1.setYafterColl(0); - domain1.setDomainToLayoutWd(0); - domain1.setTop(0); - domain1.setLeft(0); - domain1.setHeight(0); - domain1.setWidth(0); - domain1.setName("test"); - domain1.setIndexChanged(false); - domain1.setContainers(null); - - assertEquals(domain.getP(), domain1.getP()); - assertEquals(domain.getNewXafterColl(), domain1.getNewXafterColl(), DELTA); - assertEquals(domain.getYafterColl(), domain1.getYafterColl(), DELTA); - assertEquals(domain.getDomainToLayoutWd(), domain1.getDomainToLayoutWd(), DELTA); - assertEquals(domain.getTop(), domain1.getTop(), DELTA); - assertEquals(domain.getLeft(), domain1.getLeft(), DELTA); - assertEquals(domain.getHeight(), domain1.getHeight(), DELTA); - assertEquals(domain.getWidth(), domain1.getWidth(), DELTA); - assertEquals(domain.getName(), domain1.getName()); - assertEquals(domain.isIndexChanged(), domain1.isIndexChanged()); - assertEquals(domain.getContainerRowCol(), domain1.getContainerRowCol()); - } - - @Test - public void computeSizeTest(){ - Domain domain = new Domain("test", "VNI", 0, 0, 0, 0, 0, 2, 2); - Container container = new Container("test","test",1,1,10,10,10,10,10,10); - Map<String, Container> containerRowCol = new HashMap<>(); - containerRowCol.put("00", container); - containerRowCol.put("10", container); - containerRowCol.put("11", container); - domain.setContainers(containerRowCol); - Size size = domain.computeSize(); - assertEquals(5.0, size.getHeight(), DELTA); - } - @Test - public void computeSizeWithoutNameTest(){ - Domain domain = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Container container = new Container("test","test",1,1,10,10,10,10,10,10); - Map<String, Container> containerRowCol = new HashMap<>(); - containerRowCol.put("00", container); - containerRowCol.put("10", container); - containerRowCol.put("11", container); - domain.setContainers(containerRowCol); - Size size = domain.computeSize(); - assertEquals(5.0, size.getHeight(), DELTA); - } - - @Test - public void computeConatinerPositionsTest(){ - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Container container01 = new Container("test","test",1,1,10,10,10,10,10,10); - containerRowCol.put("00", container00); - containerRowCol.put("10", container01); - containerRowCol.put("11", container01); - - Domain domain = new Domain("test", "XYZ", 0, 1, 1, 4, 4, 2, 2); - domain.setContainers(containerRowCol); - domain.computeConatinerPositions(); - assertEquals(21.0, domain.getContainerRowCol().get("10").getP().getX(), DELTA); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainVOTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainVOTest.java deleted file mode 100644 index 20fabc15..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/DomainVOTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import java.util.Date; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.DomainVo; - -public class DomainVOTest { - - public DomainVo mockDomainVO(){ - DomainVo domainVo = new DomainVo(); - - domainVo.setId((long) 1); - domainVo.setCreated(new Date()); - domainVo.setModified(new Date()); - domainVo.setCreatedId((long) 1); - domainVo.setModifiedId((long) 1); - domainVo.setRowNum((long) 1); - domainVo.setAuditUserId(null); - domainVo.setAuditTrail(null); - - return domainVo; - } - - @Test - public void domainVoTest(){ - DomainVo domainVo = mockDomainVO(); - - DomainVo domainVo1 = new DomainVo(); - domainVo1.setId((long) 1); - domainVo1.setCreated(new Date()); - domainVo1.setModified(new Date()); - domainVo1.setCreatedId((long) 1); - domainVo1.setModifiedId((long) 1); - domainVo1.setRowNum((long) 1); - domainVo1.setAuditUserId(null); - domainVo1.setAuditTrail(null); - - assertEquals(domainVo.getId(), domainVo1.getId()); -// assertEquals(domainVo.getCreated(), domainVo1.getCreated()); -// assertEquals(domainVo.getModified(), domainVo1.getModified()); - assertEquals(domainVo.getCreatedId(), domainVo1.getCreatedId()); - assertEquals(domainVo.getModifiedId(), domainVo1.getModifiedId()); - assertEquals(domainVo.getRowNum(), domainVo1.getRowNum()); - assertEquals(domainVo.getAuditUserId(), domainVo1.getAuditUserId()); - assertEquals(domainVo.getAuditTrail(), domainVo1.getAuditTrail()); - } - - @Test - public void copyTest(){ - DomainVo domainVo = mockDomainVO(); - domainVo.copy(true); - } - - @Test - public void equalTest(){ - DomainVo domainVo1 = mockDomainVO(); - DomainVo domainVo2 = mockDomainVO(); -// assertEquals(true, domainVo1.equals(domainVo2)); - } - - @Test - public void compareTest(){ - DomainVo domainVo1 = mockDomainVO(); - DomainVo domainVo2 = mockDomainVO(); - assertEquals(0, domainVo1.compareTo(domainVo2)); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementDetailsTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementDetailsTest.java deleted file mode 100644 index 1f657e8d..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementDetailsTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.ElementDetails; - -public class ElementDetailsTest { - - public ElementDetails mockElementDetails(){ - ElementDetails elementDetails = new ElementDetails("test","test","test","test","test","test","test","test","test","test"); - - elementDetails.setLogical_group("test"); - - return elementDetails; - } - - @Test - public void elementDetailsTest(){ - ElementDetails elementDetails = mockElementDetails(); - - ElementDetails elementDetails1 = new ElementDetails("test","test","test","test","test","test","test","test","test","test"); - elementDetails1.setLogical_group("test"); - - assertEquals(elementDetails.getLogical_group(), elementDetails1.getLogical_group()); - } -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementTest.java deleted file mode 100644 index d4dbed3e..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/ElementTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Element; - -public class ElementTest { - - public Element mockElement(){ - Element element = new Element("test","test","test","test","test",null); - - element.setId("test"); - element.setName("test"); - element.setTop(10); - element.setLeft(10); - element.setHeight(10); - element.setWidth(10); - element.setImgFileName("test"); - element.setBorderType("test"); - element.setBgColor("test"); - element.setP(null); - - return element; - } - - @Test - public void elementTest(){ - Element element = mockElement(); - - Element element1 = new Element("test","test","test","test","test",null); - - assertEquals(element.getId(), element1.getId()); - assertEquals(element.getName(), element1.getName()); - assertEquals(element.getImgFileName(), element1.getImgFileName()); - assertEquals(element.getBorderType(), element1.getBorderType()); - assertEquals(element.getP(), element1.getP()); - } - -} diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/FusionCommandTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/FusionCommandTest.java deleted file mode 100644 index ecaf9e54..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/FusionCommandTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.*; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.FusionCommand; - -public class FusionCommandTest { - - public FusionCommand mockFusionCommand(){ - FusionCommand fusionCommand = new FusionCommand(); - - fusionCommand.setTask("test"); - - return fusionCommand; - } - - @Test - public void fusionCommandTest(){ - FusionCommand fusionCommand = mockFusionCommand(); - - FusionCommand fusionCommand1 = new FusionCommand(); - fusionCommand1.setTask("test"); - - assertEquals(fusionCommand.getTask(), fusionCommand1.getTask()); - } - -}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java deleted file mode 100644 index d231703e..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java +++ /dev/null @@ -1,336 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Container; -import org.onap.portalsdk.core.domain.support.Domain; -import org.onap.portalsdk.core.domain.support.Layout; -import org.onap.portalsdk.core.domain.support.Position; - -public class LayoutTest { - - private static final double DELTA = 1e-15; - - public Layout mockLayout(){ - Layout layout = new Layout(null, 0, 0, 0, 0); - - layout.setCollapsedDomainsNewList(null); - layout.setCollapsedDomains(null); - layout.setNumberofColsofDomains(0); - layout.setDomainRowCol(null); - - return layout; - } - - @Test - public void layoutTest(){ - Layout layout = mockLayout(); - - Layout layout1 = new Layout(null, 0, 0, 0, 0); - layout1.setCollapsedDomainsNewList(null); - layout1.setCollapsedDomains(null); - layout1.setNumberofColsofDomains(0); - layout1.setDomainRowCol(null); - - assertEquals(layout.getCollapsedDomains(), layout1.getCollapsedDomains()); - assertEquals(layout.getCollapsedDomainsNewList(), layout1.getCollapsedDomainsNewList()); - assertEquals(layout.getNumberofColsofDomains(), layout1.getNumberofColsofDomains()); - assertEquals(layout.getDomainRowCol(), layout1.getDomainRowCol()); - } - - @Test - public void computeDomainPositionsTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map<String, Domain> domainRowCol = new HashMap<>(); - List<Domain> domainList = new ArrayList<>(); - domainList.add(domain); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomainsNewList(domainList); - layout.computeDomainPositions(); - assertEquals(5.0, layout.getDomainRowCol().get("00").getP().getY(), DELTA); - } - - @Test - public void computeDomainPositionsModifiedTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - domain.setContainers(containerRowCol); - Map<String, Domain> domainRowCol = new HashMap<>(); - List<Domain> domainList = new ArrayList<>(); - domainList.add(domain); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomainsNewList(domainList); - layout.computeDomainPositionsModified(); - assertEquals(5.0, layout.getDomainRowCol().get("00").getP().getY(), DELTA); - } - - @Test - public void collapseDomainModifiedTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomainModified("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - @Test - public void collapseDomainNewTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomainNew("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - @Test - public void collapseDomainTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain.setP(position); - domain2.setP(position); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - - @Test - public void uncollapseDomainModifiedTest(){ - - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map<String, Container> innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map<String, Domain> originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomains(originalDomainRowCol); - - layout.uncollapseDomainModified("XYZ"); - assertEquals(3, layout.getNumberofColsofDomains(), DELTA); - - } - - - @Test - public void uncollapseDomainTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map<String, Container> innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map<String, Domain> originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomains(originalDomainRowCol); - - layout.uncollapseDomain("XYZ"); - assertEquals(10.6, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - } - - @Test - public void uncollapseDomainNewTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map<String, Container> innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map<String, Domain> originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - layout.uncollapseDomainNew("XYZ"); - assertEquals(11.0, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - } - - @Test - public void uncollapseDomainNew1Test(){ - - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map<String, Domain> domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map<String, Container> innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map<String, Domain> originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - layout.uncollapseDomainNew1("XYZ"); - assertEquals(11.0, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - - } - -} - diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/NameValueIdTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/NameValueIdTest.java deleted file mode 100644 index 84720021..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/NameValueIdTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.DomainVo; -import org.onap.portalsdk.core.domain.support.NameValueId; - -public class NameValueIdTest { - - public NameValueId mockNameValueId(){ - NameValueId nameValueId = new NameValueId("test","test"); - - nameValueId.setLab("test"); - nameValueId.setVal("test"); - - return nameValueId; - } - - @Test - public void nameValueIdTest(){ - NameValueId nameValueId = mockNameValueId(); - - NameValueId nameValueId1 = new NameValueId("test","test"); - nameValueId1.setLab("test"); - nameValueId1.setVal("test"); - - assertEquals(nameValueId.getLab(), nameValueId1.getLab()); - assertEquals(nameValueId.getVal(), nameValueId1.getVal()); - } - - @Test - public void equalsTest(){ - NameValueId nameValueId1 = mockNameValueId(); - NameValueId nameValueId2 = mockNameValueId(); - assertEquals(true, nameValueId1.equals(nameValueId2)); - } - - @Test - public void hashCodeTest(){ - NameValueId nameValueId1 = mockNameValueId(); - assertNotNull(nameValueId1.hashCode()); - } -}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/PositionTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/PositionTest.java deleted file mode 100644 index e75f1d10..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/PositionTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Position; - -public class PositionTest { - - private static final double DELTA = 1e-15; - - public Position mockPosition(){ - Position position = new Position(); - position.setX(10); - position.setY(10); - - return position; - } - - @Test - public void positionTest(){ - Position position = mockPosition(); - - Position position1 = new Position(); - position1.setX(10); - position1.setY(10); - - assertEquals(position.getX(), position1.getX(), DELTA); - assertEquals(position.getY(), position1.getY(), DELTA); - } -}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/SizeTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/SizeTest.java deleted file mode 100644 index 3ae57e39..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/SizeTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * ============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.domain.support; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Size; - -public class SizeTest { - - private static final double DELTA = 1e-15; - - public Size mockSize(){ - Size size = new Size(); - size.setHeight(10); - size.setWidth(10); - - return size; - } - - @Test - public void sizeTest(){ - Size size = mockSize(); - - Size size1 = new Size(); - size1.setHeight(10); - size1.setWidth(10); - - assertEquals(size.getHeight(), size1.getHeight(), DELTA); - assertEquals(size.getWidth(), size1.getWidth(), DELTA); - } - -}
\ No newline at end of file |