From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../openecomp-sdc-activity-log-api/pom.xml | 34 ++++++ .../sdc/activitylog/dao/ActivityLogDao.java | 31 +++++ .../sdc/activitylog/dao/ActivityLogDaoFactory.java | 30 +++++ .../activitylog/dao/type/ActivityLogEntity.java | 126 +++++++++++++++++++++ .../src/main/resources/factoryConfiguration.json | 3 + .../openecomp-sdc-activity-log-core/pom.xml | 29 +++++ .../dao/impl/ActivityLogDaoCassandraImpl.java | 87 ++++++++++++++ .../dao/impl/ActivityLogDaoFactoryImpl.java | 32 ++++++ .../lib/openecomp-sdc-activity-log-lib/pom.xml | 21 ++++ 9 files changed, 393 insertions(+) create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/resources/factoryConfiguration.json create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java create mode 100644 openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml (limited to 'openecomp-be/lib/openecomp-sdc-activity-log-lib') diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml new file mode 100644 index 0000000000..17b53a217c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + openecomp-sdc-activity-log-api + + + org.openecomp.sdc + openecomp-sdc-activity-log-lib + 1.1.0-SNAPSHOT + + + + + org.openecomp.core + openecomp-facade-core + ${project.version} + + + org.openecomp.core + openecomp-nosqldb-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-versioning-api + ${project.version} + + + + + diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java new file mode 100644 index 0000000000..867404b835 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java @@ -0,0 +1,31 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.activitylog.dao; + +import org.openecomp.core.dao.BaseDao; +import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity; +import org.openecomp.sdc.versioning.dao.types.Version; + +import java.util.Collection; + +public interface ActivityLogDao extends BaseDao { + Collection getActivityLogListForItem(String itemId, String versionId); +} diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java new file mode 100644 index 0000000000..103b253d89 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java @@ -0,0 +1,30 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.sdc.activitylog.dao; + +import org.openecomp.core.factory.api.AbstractFactory; +import org.openecomp.core.factory.api.AbstractComponentFactory; + + +public abstract class ActivityLogDaoFactory extends AbstractComponentFactory { + public static ActivityLogDaoFactory getInstance() { + return AbstractFactory.getInstance(ActivityLogDaoFactory.class); + } +} diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java new file mode 100644 index 0000000000..8f57a56d73 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java @@ -0,0 +1,126 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.activitylog.dao.type; + +import com.datastax.driver.mapping.annotations.*; +import org.openecomp.sdc.versioning.dao.types.Version; + +import java.util.Calendar; +import java.util.Date; + +@Table(keyspace = "dox", name = "activity_log") +public class ActivityLogEntity { + @PartitionKey + @Column(name = "item_id") + private String itemId; + @ClusteringColumn(value = 1) + @Column(name = "version_id") + private String versionId; + @ClusteringColumn + @Column(name = "activity_id") + private String id; + private String type; + private String user; + private Date timestamp; + private boolean success; + private String message; + private String comment; + + public ActivityLogEntity() {} + + public ActivityLogEntity(String itemId, String versionId, String type, String user, boolean success, String message, String comment) { + this.itemId = itemId; + this.versionId = versionId; + this.type = type; + this.user = user; + this.success = success; + this.message = message; + this.comment = comment; + Calendar now = Calendar.getInstance(); + this.timestamp = now.getTime(); + } + + public String getItemId() { return itemId; } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getVersionId() { + return versionId; + } + + public void setVersionId(String versionId) { + this.versionId = versionId; + } + + public String getId() { return id; } + + public void setId(String id) { this.id = id; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } +} diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/resources/factoryConfiguration.json b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/resources/factoryConfiguration.json new file mode 100644 index 0000000000..a3c3588330 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/resources/factoryConfiguration.json @@ -0,0 +1,3 @@ +{ + "org.openecomp.sdc.activitylog.dao.ActivityLogDaoFactory": "org.openecomp.sdc.activitylog.dao.impl.ActivityLogDaoFactoryImpl" +} \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml new file mode 100644 index 0000000000..814928e57a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + openecomp-sdc-activity-log-core + + + org.openecomp.sdc + openecomp-sdc-activity-log-lib + 1.1.0-SNAPSHOT + + + + + org.openecomp.sdc + openecomp-sdc-activity-log-api + ${project.version} + + + org.openecomp.core + openecomp-nosqldb-core + ${project.version} + + + + + diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java new file mode 100644 index 0000000000..fb277b73d2 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java @@ -0,0 +1,87 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.sdc.activitylog.dao.impl; + +import com.datastax.driver.mapping.Mapper; +import com.datastax.driver.mapping.Result; +import com.datastax.driver.mapping.annotations.Accessor; +import com.datastax.driver.mapping.annotations.Query; +import org.openecomp.core.dao.impl.CassandraBaseDao; +import org.openecomp.core.nosqldb.api.NoSqlDb; +import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; +import org.openecomp.sdc.activitylog.dao.ActivityLogDao; +import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity; + +import java.util.Collection; +import java.util.Date; + +public class ActivityLogDaoCassandraImpl extends CassandraBaseDao implements ActivityLogDao{ + private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); + private static final Mapper mapper = + noSqlDb.getMappingManager().mapper(ActivityLogEntity.class); + private static final ActivityLogAccessor accessor = + noSqlDb.getMappingManager().createAccessor(ActivityLogAccessor.class); + + @Override + protected Mapper getMapper() { + return mapper; + } + + @Override + protected Object[] getKeys(ActivityLogEntity entity) { + return new Object[0]; + } + + @Override + public Collection list(ActivityLogEntity entity) { + return accessor.list().all(); + } + + @Override + public void create(ActivityLogEntity activityLogEntity) { + accessor.create(activityLogEntity.getItemId(), activityLogEntity.getVersionId(),activityLogEntity.getId(), + activityLogEntity.getType(),activityLogEntity.getUser(), activityLogEntity.getTimestamp(), activityLogEntity.isSuccess(), + activityLogEntity.getMessage(), activityLogEntity.getComment()); + } + + @Override + public Collection getActivityLogListForItem(String itemId, String versionId) { + return accessor.getForItem(itemId, versionId).all(); + } + + + @Accessor + interface ActivityLogAccessor { + @Query("select item_id, version_id, activity_id, type, user, timestamp, success, message, comment" + + " from activity_log") + Result list(); + + @Query("select item_id, version_id, activity_id, type, user, timestamp, success, message, comment" + + " from activity_log where item_id=? and version_id=?") + Result getForItem(String itemId, String versionId); + + @Query("insert into activity_log " + + " (item_id, version_id, activity_id, type, user, timestamp, success, message, comment)" + + " values (?,?,?,?,?,?,?,?,?)") + Result create(String itemId, String versionId, String id, String type, + String user, Date timestamp, boolean success, + String message, String comment); + } +} diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java new file mode 100644 index 0000000000..bcc0d74c97 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.sdc.activitylog.dao.impl; + +import org.openecomp.sdc.activitylog.dao.ActivityLogDao; +import org.openecomp.sdc.activitylog.dao.ActivityLogDaoFactory; + +public class ActivityLogDaoFactoryImpl extends ActivityLogDaoFactory { + private static final ActivityLogDao INSTANCE = new ActivityLogDaoCassandraImpl(); + + @Override + public ActivityLogDao createInterface() { + return INSTANCE; + } +} diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml new file mode 100644 index 0000000000..48909a697f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + openecomp-sdc-activity-log-lib + pom + + + org.openecomp.sdc + openecomp-sdc-lib + 1.1.0-SNAPSHOT + + + + openecomp-sdc-activity-log-api + openecomp-sdc-activity-log-core + + + + \ No newline at end of file -- cgit 1.2.3-korg