fixes after review

wivern · wivern · commit 47b1df0ad900 · 2019-10-17T14:48:34.000+03:00
diff --git a/src/main/java/com/odysseusinc/arachne/datanode/config/HibernateValidatorJpaConfig.java b/src/main/java/com/odysseusinc/arachne/datanode/config/HibernateValidatorJpaConfig.java
@@ -52,6 +52,14 @@ protected void customizeVendorProperties(Map<String, Object> vendorProperties) {
 
         super.customizeVendorProperties(vendorProperties);
         if (Objects.nonNull(validator)) {
+            /*
+                This is required since Hibernate uses it's own validator factory by default
+                which instantiates validator from constructor rather than getting it from application context.
+                As custom validation that requires dependency injection is used for DataNode entity object
+                then LocalSpringContextValidatorFactory should be used by hibernate and that's exactly
+                that the following parameter does.
+                As
+             */
             vendorProperties.put("javax.persistence.validation.factory", validator);
         }
     }
diff --git a/src/main/java/com/odysseusinc/arachne/datanode/model/datanode/validation/DataNodeTokenValidator.java b/src/main/java/com/odysseusinc/arachne/datanode/model/datanode/validation/DataNodeTokenValidator.java
@@ -43,7 +43,7 @@ public void initialize(NonEmptyToken nonEmptyToken) {
     @Override
     public boolean isValid(DataNode dataNode, ConstraintValidatorContext context) {
 
-        if (FunctionalMode.NETWORK.equals(dataNodeService.getDataNodeMode())) {
+        if (FunctionalMode.NETWORK == dataNodeService.getDataNodeMode()) {
             boolean valid = Objects.nonNull(dataNode) && StringUtils.isNotBlank(dataNode.getToken());
             if (!valid) {
                 context.disableDefaultConstraintViolation();
diff --git a/src/main/java/com/odysseusinc/arachne/datanode/service/impl/DataNodeServiceImpl.java b/src/main/java/com/odysseusinc/arachne/datanode/service/impl/DataNodeServiceImpl.java
@@ -83,7 +83,7 @@ public DataNode create(User user, DataNode dataNode) throws AlreadyExistsExcepti
         if (currentDataNode.isPresent()) {
             throw new AlreadyExistsException(ALREADY_EXISTS_EXCEPTION);
         }
-        if (getDataNodeMode().equals(FunctionalMode.NETWORK)) {
+        if (FunctionalMode.NETWORK == getDataNodeMode()) {
             dataNode = centralIntegrationService.sendDataNodeCreationRequest(user, dataNode);
         }
         return dataNodeRepository.save(dataNode);

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,14 @@ protected void customizeVendorProperties(Map<String, Object> vendorProperties) {`
`52`	`52`
`53`	`53`	`super.customizeVendorProperties(vendorProperties);`
`54`	`54`	`if (Objects.nonNull(validator)) {`
	`55`	`+ /*`
	`56`	`+ This is required since Hibernate uses it's own validator factory by default`
	`57`	`+ which instantiates validator from constructor rather than getting it from application context.`
	`58`	`+ As custom validation that requires dependency injection is used for DataNode entity object`
	`59`	`+ then LocalSpringContextValidatorFactory should be used by hibernate and that's exactly`
	`60`	`+ that the following parameter does.`
	`61`	`+ As`
	`62`	`+ */`
`55`	`63`	`vendorProperties.put("javax.persistence.validation.factory", validator);`
`56`	`64`	`}`
`57`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public DataNode create(User user, DataNode dataNode) throws AlreadyExistsExcepti`
`83`	`83`	`if (currentDataNode.isPresent()) {`
`84`	`84`	`throw new AlreadyExistsException(ALREADY_EXISTS_EXCEPTION);`
`85`	`85`	`}`
`86`		`- if (getDataNodeMode().equals(FunctionalMode.NETWORK)) {`
	`86`	`+ if (FunctionalMode.NETWORK == getDataNodeMode()) {`
`87`	`87`	`dataNode = centralIntegrationService.sendDataNodeCreationRequest(user, dataNode);`
`88`	`88`	`}`
`89`	`89`	`return dataNodeRepository.save(dataNode);`