X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdto%2FDomainVo.java;h=91ea87f2d730eda45ce1763e3dd36be299b7f6c2;hb=39fb119cdaea6bd8d801b22d195db39f6d8faaca;hp=f64199401496603dae1ad2d33e899dee702a8484;hpb=a400cd234d2ac8e211ccb73bdc731f8625270252;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
index f6419940..91ea87f2 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
@@ -1,3 +1,43 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
+ *
+ * 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============================================
+ *
+ *
+ */
+
 package org.onap.portal.domain.dto;
 
 import java.io.ByteArrayInputStream;
@@ -5,39 +45,46 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.onap.portalapp.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.utils.EcompPortalUtils;
 import org.onap.portalsdk.core.domain.FusionVo;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 
 @Getter
 @Setter
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-@Inheritance(strategy = InheritanceType.JOINED)
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 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 LocalDateTime created;
+       protected LocalDateTime modified;
        protected FnUser createdId;
        protected FnUser modifiedId;
        protected Long rowNum;
        protected Serializable auditUserId;
        protected Set auditTrail = null;
 
+       public DomainVo(Long id) {
+              this.id = id;
+       }
+
        @Override
        public int compareTo(Object obj) {
               Long c1 = this.getId();
-              Long c2 = ((org.onap.portalsdk.core.domain.support.DomainVo)obj).getId();
+              Long c2 = ((org.onap.portalsdk.core.domain.support.DomainVo) obj).getId();
               return c1 != null && c2 != null ? c1.compareTo(c2) : 1;
        }
 
@@ -54,12 +101,12 @@ public class DomainVo extends FusionVo implements Serializable, Cloneable, Compa
                      oos.writeObject(this);
                      bais = new ByteArrayInputStream(baos.toByteArray());
                      ois = new ObjectInputStream(bais);
-                     newVo = (DomainVo)ois.readObject();
+                     newVo = (DomainVo) ois.readObject();
                      if (isIdNull) {
                             newVo.setId(null);
                      }
               } catch (Exception var8) {
-                     var8.printStackTrace();
+                  logger.error("exception occured",var8);
               }
 
               return newVo;
@@ -68,4 +115,22 @@ public class DomainVo extends FusionVo implements Serializable, Cloneable, Compa
        public Object clone() throws CloneNotSupportedException {
               return super.clone();
        }
+
+       public boolean equals(Object other) {
+              if (this == other) {
+                     return true;
+              } else if (other == null) {
+                     return false;
+              } else if (!(other instanceof DomainVo)) {
+                     return false;
+              } else {
+                     DomainVo castOther = (DomainVo)other;
+                     return this.getId().equals(castOther.getId())
+                             && this.getCreated().equals(castOther.getCreated())
+                             && this.getCreatedId().equals(castOther.getCreatedId())
+                             && this.getModified().equals(castOther.getModified())
+                             && this.getModifiedId() == castOther.getModifiedId();
+              }
+       }
+
 }