code enhancement

ITUBIDB · Jun 6, 2018 · 0479dbc · 0479dbc
1 parent c67c19d
commit 0479dbc
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 17 deletions.
diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/Property.java b/src/main/java/edu/itu/cavabunga/lib/entity/Property.java
@@ -6,7 +6,6 @@
 import edu.itu.cavabunga.lib.exception.Validation;
 import lombok.Data;
 import org.hibernate.annotations.DiscriminatorOptions;
-import org.omg.PortableServer.THREAD_POLICY_ID;
 
 import javax.persistence.*;
 import javax.persistence.Version;

diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/component/Journal.java b/src/main/java/edu/itu/cavabunga/lib/entity/component/Journal.java
@@ -12,7 +12,7 @@
 public class Journal extends Component {
     @Override
     public void validate(){
-        if(!(this.getParent() instanceof Component)){
+        if(this.getParent() != null && !(this.getParent() instanceof Component)){
             throw new Validation("Journal component cannot be child of: " + this.getParent().getClass().getName());
         }
 

diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/component/Standard.java b/src/main/java/edu/itu/cavabunga/lib/entity/component/Standard.java
@@ -22,5 +22,6 @@ public void validate(){
         requireOneList.add(PropertyType.Dtstart);
         requireOneList.add(PropertyType.Tzname);
         requireOneList.add(PropertyType.Tzoffsetfrom);
+        super.validateRequiredOneProperties(requireOneList);
     }
 }
diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/parameter/Range.java b/src/main/java/edu/itu/cavabunga/lib/entity/parameter/Range.java
@@ -2,7 +2,6 @@
 
 import edu.itu.cavabunga.lib.entity.Parameter;
 import edu.itu.cavabunga.lib.exception.Validation;
-import org.omg.PortableServer.THREAD_POLICY_ID;
 
 import javax.persistence.Entity;
 

diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/property/Calscale.java b/src/main/java/edu/itu/cavabunga/lib/entity/property/Calscale.java
@@ -4,7 +4,6 @@
 import edu.itu.cavabunga.lib.exception.Validation;
 
 import javax.persistence.Entity;
-import java.util.List;
 
 @Entity
 public class Calscale extends Property {

diff --git a/src/main/java/edu/itu/cavabunga/lib/entity/property/Description.java b/src/main/java/edu/itu/cavabunga/lib/entity/property/Description.java
@@ -3,7 +3,6 @@
 import edu.itu.cavabunga.lib.entity.Property;
 
 import javax.persistence.Entity;
-import java.util.concurrent.ExecutionException;
 
 @Entity
 public class Description extends Property {

diff --git a/src/main/java/edu/itu/cavabunga/lib/exception/Conflict.java b/src/main/java/edu/itu/cavabunga/lib/exception/Conflict.java
@@ -1,10 +1,7 @@
 package edu.itu.cavabunga.lib.exception;
 
 public class Conflict extends RuntimeException {
-    public Conflict(){
-
-    }
-
+    public Conflict(){}
     public Conflict(String message){
         super(message);
     }

diff --git a/src/main/java/edu/itu/cavabunga/lib/exception/NotFound.java b/src/main/java/edu/itu/cavabunga/lib/exception/NotFound.java
@@ -1,10 +1,7 @@
 package edu.itu.cavabunga.lib.exception;
 
 public class NotFound extends RuntimeException {
-    public NotFound(){
-
-    }
-
+    public NotFound(){}
     public NotFound(String message){
         super(message);
     }

diff --git a/src/main/java/edu/itu/cavabunga/lib/exception/Validation.java b/src/main/java/edu/itu/cavabunga/lib/exception/Validation.java
@@ -1,10 +1,7 @@
 package edu.itu.cavabunga.lib.exception;
 
 public class Validation extends RuntimeException {
-    public Validation(){
-
-    }
-
+    public Validation(){}
     public Validation(String message) { super(message); }
     public Validation(Throwable cause) { super(cause); }
 }