From 5cb24dbf4169e7638b8af649c01183e279cc4cf5 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Fri, 23 Mar 2018 00:11:53 -0400 Subject: Use new ONAP artifact w/o flexslider dependency This has additional changes for using ONAP artifact in dbca-common subdir. Change-Id: I1b0b50dc8d884500d2e0ba1ba8d21373834f9486 Signed-off-by: dglFromAtt Issue-ID: DMAAP-341 --- .../dcae/dmaapbc/dbcapp/controller/DataRouterController.java | 4 ++-- .../dbcapp/controller/DbcappRestrictedBaseController.java | 10 +++++----- .../dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java | 8 ++++---- .../dcae/dmaapbc/dbcapp/controller/HealthCheckController.java | 6 +++--- .../dmaapbc/dbcapp/controller/MessageRouterController.java | 4 ++-- .../java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java | 4 ++-- .../dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java | 2 +- .../java/org/onap/fusionapp/service/AdminAuthExtension.java | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'dcae_dmaapbc_webapp/dbca-common/src/main/java') diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java index c2fbb26..bbf1e56 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java @@ -8,8 +8,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.onap.dcae.dmaapbc.dbcapp.util.DbcappProperties; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.util.SystemProperties; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java index 7964e45..587eb7f 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java @@ -30,11 +30,11 @@ import org.onap.dcae.dmaapbc.model.ErrorResponse; import org.onap.dcae.dmaapbc.model.Feed; import org.onap.dcae.dmaapbc.model.MR_Client; import org.onap.dcae.dmaapbc.model.Topic; -import org.openecomp.portalsdk.core.controller.RestrictedBaseController; -import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; -import org.openecomp.portalsdk.core.web.support.UserUtils; +import org.onap.portalsdk.core.controller.RestrictedBaseController; +import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java index bd5c420..f0b5ded 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java @@ -12,10 +12,10 @@ import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess; import org.onap.dcae.dmaapbc.model.Dmaap; import org.onap.dcae.dmaapbc.model.DmaapObject; import org.onap.dcae.dmaapbc.model.ErrorResponse; -import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.util.SystemProperties; -import org.openecomp.portalsdk.core.web.support.UserUtils; +import org.onap.portalsdk.core.domain.User; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; +import org.onap.portalsdk.core.web.support.UserUtils; import org.slf4j.MDC; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java index 820cd5b..ff13445 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java @@ -5,9 +5,9 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import org.onap.dcae.dmaapbc.dbcapp.service.DmaapAccessService; -import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.util.SystemProperties; +import org.onap.portalsdk.core.controller.UnRestrictedBaseController; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java index 70bc90a..8039169 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java @@ -5,8 +5,8 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.util.SystemProperties; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java index 31b0fdd..3108ea9 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java @@ -1,7 +1,7 @@ package org.onap.dcae.dmaapbc.dbcapp.domain; -import org.openecomp.portalsdk.core.domain.support.DomainVo; -import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.domain.support.DomainVo; +import org.onap.portalsdk.core.onboarding.util.CipherUtil; /** * Hold an access profile for a DMaaP REST endpoint. Represents one row in the diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java index 96fb152..549989b 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java @@ -7,7 +7,7 @@ import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Restrictions; import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess; import org.onap.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel; -import org.openecomp.portalsdk.core.service.DataAccessService; +import org.onap.portalsdk.core.service.DataAccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java index 1892553..35aa01a 100644 --- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java +++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java @@ -1,6 +1,6 @@ package org.onap.fusionapp.service; -import org.openecomp.portalsdk.core.domain.User; +import org.onap.portalsdk.core.domain.User; //@Service("adminAuthExtension") //@Transactional -- cgit 1.2.3-korg