diff options
author | 2019-04-10 13:38:59 -0700 | |
---|---|---|
committer | 2019-04-11 07:28:52 -0400 | |
commit | a7a144ba512654bd93b0856b1e9eb5c886060c21 (patch) | |
tree | 808acb95b4608c9e7e4e4501f4c4111e9563fa18 /controlloop/common/eventmanager/src/main/java/org/onap | |
parent | 92fc7744a4df901d1688b9fa8da899372ea76fd8 (diff) |
Cleanup PIP/Database-related code.
Ensure database schema/naming consistent across repos.
Ensure PIP implementation consistent across repos.
Cleanup unused imports and made sure licenses are ok.
Issue-ID: POLICY-1471
Change-Id: I20a325fe3e66e6ae400e603ec366315aea716993
Signed-off-by: Joshua Reich <jreich@research.att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'controlloop/common/eventmanager/src/main/java/org/onap')
2 files changed, 3 insertions, 146 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java index 7bd0a0e54..dfd2a1af9 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java @@ -50,6 +50,7 @@ import org.onap.policy.controlloop.actor.so.SoActorServiceProvider; import org.onap.policy.controlloop.actor.vfc.VfcActorServiceProvider; import org.onap.policy.controlloop.policy.Policy; import org.onap.policy.controlloop.policy.PolicyResult; +import org.onap.policy.database.operationshistory.Dbao; import org.onap.policy.drools.system.PolicyEngine; import org.onap.policy.guard.Util; import org.onap.policy.sdnc.SdncResponse; @@ -909,7 +910,7 @@ public class ControlLoopOperationManager implements Serializable { String opsHistPu = System.getProperty("OperationsHistoryPU"); - if (!"TestOperationsHistoryPU".equals(opsHistPu)) { + if (!"OperationsHistoryPUTest".equals(opsHistPu)) { opsHistPu = "OperationsHistoryPU"; } else { props.clear(); @@ -922,7 +923,7 @@ public class ControlLoopOperationManager implements Serializable { return; } - OperationsHistoryDbEntry newEntry = new OperationsHistoryDbEntry(); + Dbao newEntry = new Dbao(); newEntry.setClosedLoopName(this.onset.getClosedLoopControlName()); newEntry.setRequestId(this.onset.getRequestId().toString()); diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/OperationsHistoryDbEntry.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/OperationsHistoryDbEntry.java deleted file mode 100644 index 002f39119..000000000 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/OperationsHistoryDbEntry.java +++ /dev/null @@ -1,144 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * controlloop - * ================================================================================ - * Copyright (C) 2017-2018 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.onap.policy.controlloop.eventmanager; - -import java.io.Serializable; -import java.sql.Timestamp; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "operationshistory10") -public class OperationsHistoryDbEntry implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column(name = "ROWID") - public long rowid; - - @Column(name = "CLNAME") - private String closedLoopName; - - private String requestId; - private String actor; - private String operation; - private String target; - private Timestamp starttime; - private Timestamp endtime; - private String subrequestId; - private String outcome; - private String message; - - public long getRowid() { - return rowid; - } - - public void setRowid(long rowid) { - this.rowid = rowid; - } - - public String getClosedLoopName() { - return closedLoopName; - } - - public void setClosedLoopName(String closedLoopName) { - this.closedLoopName = closedLoopName; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getActor() { - return actor; - } - - public void setActor(String actor) { - this.actor = actor; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public Timestamp getStarttime() { - return starttime; - } - - public void setStarttime(Timestamp starttime) { - this.starttime = starttime; - } - - public Timestamp getEndtime() { - return endtime; - } - - public void setEndtime(Timestamp endtime) { - this.endtime = endtime; - } - - public String getSubrequestId() { - return subrequestId; - } - - public void setSubrequestId(String subrequestId) { - this.subrequestId = subrequestId; - } - - public String getOutcome() { - return outcome; - } - - public void setOutcome(String outcome) { - this.outcome = outcome; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} - - |