Merge 64de1e1 into fa77f5d

TAMULib · Aug 21, 2019 · ade8f61 · ade8f61
2 parents fa77f5d + 64de1e1
commit ade8f61
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 install:
   - mvn test-compile -DskipTests=true -Dmaven.javadoc.skip=true -B -V

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -12,33 +12,33 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>user</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>token</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>email</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/data/pom.xml b/data/pom.xml
@@ -12,15 +12,15 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java b/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java
@@ -29,7 +29,6 @@ public class EntityUtility {
     public static final String NAME_COLUMN_NAME = "name";
     public static final String PASSWORD_COLUMN_NAME = "password";
     public static final String POSITION_COLUMN_NAME = "position";
-    public static final String SYSTEM_COLUMN_NAME = "isSystemRequired";
 
     public static String snakeToCamelWithoutId(String value) {
         int l = 0;
@@ -205,14 +204,6 @@ public static List<Object> queryByProperty(Class<?> clazz, String property, Obje
         return entityManager.createQuery(query).getResultList();
     }
 
-    public static Object createNewFromSystemDefault(Object model) {
-        EntityManager entityManager = SpringContext.bean(EntityManager.class);
-        setValueForProperty(model, SYSTEM_COLUMN_NAME, false);
-        setValueForProperty(model, ID_COLUMN_NAME, null);
-        entityManager.persist(model);
-        return model;
-    }
-
     public static Field recursivelyFindField(Class<?> clazz, String property) {
         Field field = null;
         try {

diff --git a/email/pom.xml b/email/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/messaging/pom.xml b/messaging/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <artifactId>webservice-parent</artifactId>
 
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
 
   <name>Weaver Webservice Parent</name>
 

diff --git a/reporting/pom.xml b/reporting/pom.xml
@@ -12,21 +12,21 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>email</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/token-provider/pom.xml b/token-provider/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -26,13 +26,13 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>token</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/token/pom.xml b/token/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/user/pom.xml b/user/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>validation</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/validation/src/main/java/edu/tamu/weaver/validation/utility/ValidationUtility.java b/validation/src/main/java/edu/tamu/weaver/validation/utility/ValidationUtility.java
@@ -2,9 +2,6 @@
 
 import static edu.tamu.weaver.data.utility.EntityUtility.NAME_COLUMN_NAME;
 import static edu.tamu.weaver.data.utility.EntityUtility.PASSWORD_COLUMN_NAME;
-import static edu.tamu.weaver.data.utility.EntityUtility.SYSTEM_COLUMN_NAME;
-import static edu.tamu.weaver.data.utility.EntityUtility.createNewFromSystemDefault;
-import static edu.tamu.weaver.data.utility.EntityUtility.getFieldForProperty;
 import static edu.tamu.weaver.data.utility.EntityUtility.getValueForProperty;
 import static edu.tamu.weaver.data.utility.EntityUtility.getValueFromPath;
 import static edu.tamu.weaver.data.utility.EntityUtility.queryAllWithClass;
@@ -237,16 +234,10 @@ public static <U extends ValidatingEntity> ValidationResults validateBusiness(Bu
 
                 // check if unique constraints will be violated!!
 
-                Boolean isSystemRequired = (Boolean) getValueForProperty(model, SYSTEM_COLUMN_NAME);
-
-                if (isSystemRequired != null && isSystemRequired) {
-                    model = (U) createNewFromSystemDefault(model);
-                } else {
-                    if (uniqueConstraintPropertyChange(model)) {
-                        UniqueConstraintViolation uniqueConstraintViolation = validateUniqueConstraints(model);
-                        invalid = uniqueConstraintViolation.invalid;
-                        message = uniqueConstraintViolation.message;
-                    }
+                if (uniqueConstraintPropertyChange(model)) {
+                    UniqueConstraintViolation uniqueConstraintViolation = validateUniqueConstraints(model);
+                    invalid = uniqueConstraintViolation.invalid;
+                    message = uniqueConstraintViolation.message;
                 }
             }
 
@@ -295,7 +286,8 @@ public static <U extends ValidatingEntity> ValidationResults validateBusiness(Bu
 
             if (!invalid) {
 
-                // check if relationships from params(columns) will cause foreign key constraints!!
+                // check if relationships from params(columns) will cause foreign key
+                // constraints!!
 
                 U modelToDelete = (U) queryResults.get(0);
 
@@ -422,14 +414,6 @@ public static <U extends ValidatingEntity> ValidationResults validateBusiness(Bu
 
             }
 
-            if (!invalid) {
-                Object value = getValueForProperty(model, SYSTEM_COLUMN_NAME);
-                if (value != null && ((Boolean) value) == true) {
-                    invalid = true;
-                    message = model.getClass().getSimpleName() + " with id " + ((WeaverEntity) model).getId() + " is a system default and cannot be deleted";
-                }
-            }
-
             if (invalid) {
                 results.addMessage(BUSINESS_MESSAGE_KEY, validator.getType().toString(), message);
                 results.setValid(false);
@@ -454,24 +438,6 @@ public static <U extends ValidatingEntity> ValidationResults validateBusiness(Bu
                 }
             }
 
-            // check if model has a system default
-
-            if (!invalid) {
-                if (getFieldForProperty(model, SYSTEM_COLUMN_NAME) == null) {
-                    invalid = true;
-                    message = model.getClass().getSimpleName() + " is not a system default in which can be reset";
-                }
-            }
-
-            // check if model is not a system default
-
-            if (!invalid) {
-                if ((Boolean) getValueForProperty(model, SYSTEM_COLUMN_NAME) == true) {
-                    invalid = true;
-                    message = model.getClass().getSimpleName() + " is the system default";
-                }
-            }
-
             if (invalid) {
                 results.addMessage(BUSINESS_MESSAGE_KEY, validator.getType().toString(), message);
                 results.setValid(false);

diff --git a/wro/pom.xml b/wro/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>