#1 merge master into dev

DICE-UNC · Apr 12, 2019 · 5c1a3fe · 5c1a3fe
1 parent 98674cb
commit 5c1a3fe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/...alnx-services/src/main/java/com/emc/metalnx/services/configuration/ConfigServiceImpl.java b/...alnx-services/src/main/java/com/emc/metalnx/services/configuration/ConfigServiceImpl.java
@@ -3,10 +3,12 @@
 
 package com.emc.metalnx.services.configuration;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.irods.jargon.core.connection.AuthScheme;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/TemplateServiceImpl.java b/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/TemplateServiceImpl.java
@@ -25,6 +25,7 @@
 import com.emc.metalnx.core.domain.entity.DataGridTemplate;
 import com.emc.metalnx.core.domain.entity.DataGridTemplateField;
 import com.emc.metalnx.core.domain.exceptions.DataGridException;
+import com.emc.metalnx.services.interfaces.MetadataTemplateException;
 import com.emc.metalnx.services.interfaces.TemplateService;
 import com.emc.metalnx.services.irods.template.SerializedMetadataTemplate;
 import com.emc.metalnx.services.irods.template.SerializedTemplateField;

diff --git a/...ices/irods/MetadataTemplateException.java → ...interfaces/MetadataTemplateException.java b/...ices/irods/MetadataTemplateException.java → ...interfaces/MetadataTemplateException.java
@@ -1,4 +1,4 @@
-package com.emc.metalnx.services.irods;
+package com.emc.metalnx.services.interfaces;
 
 import org.irods.jargon.core.exception.JargonException;
 

diff --git a/...sext-data-profiler/src/main/java/com/emc/metalnx/services/interfaces/TemplateService.java b/...sext-data-profiler/src/main/java/com/emc/metalnx/services/interfaces/TemplateService.java
@@ -11,7 +11,6 @@
 import com.emc.metalnx.core.domain.entity.DataGridTemplate;
 import com.emc.metalnx.core.domain.entity.DataGridTemplateField;
 import com.emc.metalnx.core.domain.exceptions.DataGridException;
-import com.emc.metalnx.services.irods.MetadataTemplateException;
 
 public interface TemplateService {