diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core')
3 files changed, 83 insertions, 92 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java index 32630df115..0583bed12f 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java @@ -13,99 +13,95 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.core.zusammen.api; -import com.amdocs.zusammen.adaptor.inbound.api.types.item.*; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.Element; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementConflict; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.ItemVersionConflict; +import com.amdocs.zusammen.adaptor.inbound.api.types.item.ZusammenElement; import com.amdocs.zusammen.commons.health.data.HealthInfo; import com.amdocs.zusammen.datatypes.Id; import com.amdocs.zusammen.datatypes.SessionContext; -import com.amdocs.zusammen.datatypes.item.*; +import com.amdocs.zusammen.datatypes.item.ElementContext; +import com.amdocs.zusammen.datatypes.item.Info; +import com.amdocs.zusammen.datatypes.item.Item; +import com.amdocs.zusammen.datatypes.item.ItemVersion; +import com.amdocs.zusammen.datatypes.item.ItemVersionData; +import com.amdocs.zusammen.datatypes.item.ItemVersionStatus; +import com.amdocs.zusammen.datatypes.item.Resolution; import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions; import com.amdocs.zusammen.datatypes.itemversion.Tag; - import java.util.Collection; import java.util.Optional; public interface ZusammenAdaptor { - Collection<Item> listItems(SessionContext context); + Collection<Item> listItems(SessionContext context); - Item getItem(SessionContext context, Id itemId); + Item getItem(SessionContext context, Id itemId); - void deleteItem(SessionContext context, Id itemId); + void deleteItem(SessionContext context, Id itemId); - Id createItem(SessionContext context, Info info); + Id createItem(SessionContext context, Info info); - void updateItem(SessionContext context, Id itemId, Info info); + void updateItem(SessionContext context, Id itemId, Info info); - Collection<ItemVersion> listPublicVersions(SessionContext context, Id itemId); + Collection<ItemVersion> listPublicVersions(SessionContext context, Id itemId); - ItemVersion getPublicVersion(SessionContext context, Id itemId, Id versionId); + ItemVersion getPublicVersion(SessionContext context, Id itemId, Id versionId); - Id createVersion(SessionContext context, Id itemId, Id baseVersionId, - ItemVersionData itemVersionData); + Id createVersion(SessionContext context, Id itemId, Id baseVersionId, ItemVersionData itemVersionData); - void updateVersion(SessionContext context, Id itemId, Id versionId, - ItemVersionData itemVersionData); + void updateVersion(SessionContext context, Id itemId, Id versionId, ItemVersionData itemVersionData); - ItemVersion getVersion(SessionContext context, Id itemId, Id versionId); + ItemVersion getVersion(SessionContext context, Id itemId, Id versionId); - ItemVersionStatus getVersionStatus(SessionContext context, Id itemId, Id versionId); + ItemVersionStatus getVersionStatus(SessionContext context, Id itemId, Id versionId); - ItemVersionConflict getVersionConflict(SessionContext context, Id itemId, Id versionId); + ItemVersionConflict getVersionConflict(SessionContext context, Id itemId, Id versionId); - void tagVersion(SessionContext context, Id itemId, Id versionId, Tag tag); + void tagVersion(SessionContext context, Id itemId, Id versionId, Tag tag); - void resetVersionHistory(SessionContext context, Id itemId, Id versionId, String version); + void resetVersionHistory(SessionContext context, Id itemId, Id versionId, String version); - void publishVersion(SessionContext context, Id itemId, Id versionId, String message); + void publishVersion(SessionContext context, Id itemId, Id versionId, String message); - void syncVersion(SessionContext context, Id itemId, Id versionId); + void syncVersion(SessionContext context, Id itemId, Id versionId); - void forceSyncVersion(SessionContext context, Id itemId, Id versionId); + void forceSyncVersion(SessionContext context, Id itemId, Id versionId); - void cleanVersion(SessionContext context, Id itemId, Id versionId); + void cleanVersion(SessionContext context, Id itemId, Id versionId); - Optional<ElementInfo> getElementInfo(SessionContext context, ElementContext elementContext, - Id elementId); + Optional<ElementInfo> getElementInfo(SessionContext context, ElementContext elementContext, Id elementId); - Optional<Element> getElement(SessionContext context, ElementContext elementContext, - String elementId); // TODO: 4/3/2017 change to Id + Optional<Element> getElement(SessionContext context, ElementContext elementContext, + String elementId); // TODO: 4/3/2017 change to Id - Optional<Element> getElementByName(SessionContext context, ElementContext elementContext, - Id parentElementId, String elementName); + Optional<Element> getElementByName(SessionContext context, ElementContext elementContext, Id parentElementId, String elementName); - Collection<ElementInfo> listElements(SessionContext context, ElementContext elementContext, - Id parentElementId); + Collection<ElementInfo> listElements(SessionContext context, ElementContext elementContext, Id parentElementId); - Collection<Element> listElementData(SessionContext context, ElementContext elementContext, - Id parentElementId); + Collection<Element> listElementData(SessionContext context, ElementContext elementContext, Id parentElementId); - /** - * Lists the sub elements of the element named elementName which is a sub element of - * parentElementId - */ - Collection<ElementInfo> listElementsByName(SessionContext context, ElementContext elementContext, - Id parentElementId, String elementName); + /** + * Lists the sub elements of the element named elementName which is a sub element of parentElementId + */ + Collection<ElementInfo> listElementsByName(SessionContext context, ElementContext elementContext, Id parentElementId, String elementName); - Optional<ElementInfo> getElementInfoByName(SessionContext context, ElementContext elementContext, - Id parentElementId, String elementName); + Optional<ElementInfo> getElementInfoByName(SessionContext context, ElementContext elementContext, Id parentElementId, String elementName); - Optional<ElementConflict> getElementConflict(SessionContext context, - ElementContext elementContext, Id elementId); + Optional<ElementConflict> getElementConflict(SessionContext context, ElementContext elementContext, Id elementId); - Element saveElement(SessionContext context, ElementContext elementContext, - ZusammenElement element, String message); + Element saveElement(SessionContext context, ElementContext elementContext, ZusammenElement element, String message); - void resolveElementConflict(SessionContext context, ElementContext elementContext, - ZusammenElement element, Resolution resolution); + void resolveElementConflict(SessionContext context, ElementContext elementContext, ZusammenElement element, Resolution resolution); - void revert(SessionContext context, Id itemId, Id versionId, Id revisionId); + void revert(SessionContext context, Id itemId, Id versionId, Id revisionId); - ItemVersionRevisions listRevisions(SessionContext context, Id itemId, Id versionId); + ItemVersionRevisions listRevisions(SessionContext context, Id itemId, Id versionId); - Collection<HealthInfo> checkHealth(SessionContext context); + Collection<HealthInfo> checkHealth(SessionContext context); - String getVersion(SessionContext context); + String getVersion(SessionContext context); } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptorFactory.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptorFactory.java index 53981ba478..1f0bbe58ec 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptorFactory.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptorFactory.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.core.zusammen.api; import org.openecomp.core.factory.api.AbstractComponentFactory; @@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory; public abstract class ZusammenAdaptorFactory extends AbstractComponentFactory<ZusammenAdaptor> { - public static ZusammenAdaptorFactory getInstance() { - return AbstractFactory.getInstance(ZusammenAdaptorFactory.class); - } + public static ZusammenAdaptorFactory getInstance() { + return AbstractFactory.getInstance(ZusammenAdaptorFactory.class); + } } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java index f6f8b2b5d9..a6595699f5 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java @@ -31,43 +31,39 @@ import org.openecomp.types.ElementPropertyName; public class ZusammenUtil { - private ZusammenUtil() { - throw new IllegalStateException("Utility class"); - } + private ZusammenUtil() { + throw new IllegalStateException("Utility class"); + } - public static SessionContext createSessionContext() { - org.openecomp.sdc.common.session.SessionContext asdcSessionContext = - SessionContextProviderFactory.getInstance().createInterface().get(); + public static SessionContext createSessionContext() { + org.openecomp.sdc.common.session.SessionContext asdcSessionContext = SessionContextProviderFactory.getInstance().createInterface().get(); + return createSessionContext(asdcSessionContext.getUser().getUserId(), asdcSessionContext.getTenant()); + } - return createSessionContext(asdcSessionContext.getUser().getUserId(), asdcSessionContext - .getTenant()); - } + private static SessionContext createSessionContext(String user, String tenant) { + SessionContext sessionContext = new SessionContext(); + sessionContext.setUser(new UserInfo(user)); + sessionContext.setTenant(tenant); + return sessionContext; + } - private static SessionContext createSessionContext(String user, String tenant) { - SessionContext sessionContext = new SessionContext(); - sessionContext.setUser(new UserInfo(user)); - sessionContext.setTenant(tenant); - return sessionContext; - } + public static ZusammenElement buildStructuralElement(ElementType elementType, Action action) { + return buildStructuralElement(elementType.name(), action); + } - public static ZusammenElement buildStructuralElement(ElementType elementType, Action action) { - return buildStructuralElement(elementType.name(), action); - } + public static ZusammenElement buildStructuralElement(String elementType, Action action) { + ZusammenElement element = buildElement(null, action); + Info info = new Info(); + info.setName(elementType); + info.addProperty(ElementPropertyName.elementType.name(), elementType); + element.setInfo(info); + return element; + } - - public static ZusammenElement buildStructuralElement(String elementType, Action action) { - ZusammenElement element = buildElement(null, action); - Info info = new Info(); - info.setName(elementType); - info.addProperty(ElementPropertyName.elementType.name(), elementType); - element.setInfo(info); - return element; - } - - public static ZusammenElement buildElement(Id elementId, Action action) { - ZusammenElement element = new ZusammenElement(); - element.setElementId(elementId); - element.setAction(action); - return element; - } + public static ZusammenElement buildElement(Id elementId, Action action) { + ZusammenElement element = new ZusammenElement(); + element.setElementId(elementId); + element.setAction(action); + return element; + } } |