KYLO-3021: refactor spring classes out of kylo-commons-util to reduce…

… dependencies
abandaru · Nov 10, 2018 · 3780f84 · 3780f84
1 parent 2b0b35f
commit 3780f84
Show file tree

Hide file tree

Showing 24 changed files with 107 additions and 58 deletions.
diff --git a/commons/commons-spring/pom.xml b/commons/commons-spring/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>kylo-commons-spring</artifactId>
+
+  <parent>
+    <groupId>com.thinkbiganalytics.kylo</groupId>
+    <artifactId>kylo-commons</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+  </parent>
+  <properties>
+    <java.version>1.7</java.version>
+    <plugin.license.parentRelative>../../</plugin.license.parentRelative>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-context</artifactId>
+    </dependency>
+
+    <!-- Testing -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
+</project>
diff --git a/...iganalytics/UsernameCaseStrategyUtil.java → ...iganalytics/UsernameCaseStrategyUtil.java b/...iganalytics/UsernameCaseStrategyUtil.java → ...iganalytics/UsernameCaseStrategyUtil.java
diff --git a/...cs/spring/CommonsSpringConfiguration.java → ...cs/spring/CommonsSpringConfiguration.java b/...cs/spring/CommonsSpringConfiguration.java → ...cs/spring/CommonsSpringConfiguration.java
diff --git a/...analytics/spring/FileResourceService.java → ...analytics/spring/FileResourceService.java b/...analytics/spring/FileResourceService.java → ...analytics/spring/FileResourceService.java
diff --git a/...nalytics/spring/LoadResourceCallback.java → ...nalytics/spring/LoadResourceCallback.java b/...nalytics/spring/LoadResourceCallback.java → ...nalytics/spring/LoadResourceCallback.java
diff --git a/...tics/spring/SpringApplicationContext.java → ...tics/spring/SpringApplicationContext.java b/...tics/spring/SpringApplicationContext.java → ...tics/spring/SpringApplicationContext.java
diff --git a/...s/spring/SpringEnvironmentProperties.java → ...s/spring/SpringEnvironmentProperties.java b/...s/spring/SpringEnvironmentProperties.java → ...s/spring/SpringEnvironmentProperties.java
diff --git a/commons/commons-util/pom.xml b/commons/commons-util/pom.xml
@@ -16,7 +16,6 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -29,51 +28,25 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-
-
-    <!-- Quartz framework -->
     <dependency>
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <!-- Testing -->
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-context</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -88,7 +61,7 @@
         </configuration>
       </plugin>
 
-    <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
         <configuration>
@@ -116,8 +89,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
-
   </build>
 </project>
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -25,6 +25,7 @@
     <module>commons-jpa</module>
     <module>commons-spark</module>
     <module>commons-hive</module>
+    <module>commons-spring</module>
     <module>commons-test-persistence</module>
     <module>commons-test</module>
     <module>commons-velocity-api</module>

diff --git a/...c/test/java/com/thinkbiganalytics/metadata/jpa/feed/JpaBatchJobExecutionProviderTest.java b/...c/test/java/com/thinkbiganalytics/metadata/jpa/feed/JpaBatchJobExecutionProviderTest.java
@@ -22,16 +22,13 @@
 
 import com.thinkbiganalytics.metadata.api.jobrepo.job.BatchJobExecution;
 import com.thinkbiganalytics.metadata.config.OperationalMetadataConfig;
-import com.thinkbiganalytics.metadata.core.feed.BaseFeed;
 import com.thinkbiganalytics.metadata.jpa.TestJpaConfiguration;
 import com.thinkbiganalytics.metadata.jpa.feed.security.FeedOpsAccessControlRepository;
-import com.thinkbiganalytics.metadata.jpa.feed.security.JpaFeedOpsAclEntry;
 import com.thinkbiganalytics.metadata.jpa.jobrepo.job.JpaBatchJobExecutionProvider;
 import com.thinkbiganalytics.security.AccessController;
 import com.thinkbiganalytics.spring.CommonsSpringConfiguration;
 import com.thinkbiganalytics.test.security.WithMockJaasUser;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -45,12 +42,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.UUID;
-import java.util.stream.StreamSupport;
-
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 
 @SuppressWarnings("SpringJavaAutowiringInspection")
 @RunWith(SpringJUnit4ClassRunner.class)

diff --git a/...tadata-jpa/src/test/java/com/thinkbiganalytics/metadata/jpa/feed/JpaFeedProviderTest.java b/...tadata-jpa/src/test/java/com/thinkbiganalytics/metadata/jpa/feed/JpaFeedProviderTest.java
@@ -28,7 +28,6 @@
 import com.thinkbiganalytics.metadata.config.OperationalMetadataConfig;
 import com.thinkbiganalytics.metadata.core.feed.BaseFeed;
 import com.thinkbiganalytics.metadata.jpa.TestJpaConfiguration;
-import com.thinkbiganalytics.metadata.jpa.feed.security.FeedOpsAccessControlRepository;
 import com.thinkbiganalytics.metadata.jpa.feed.security.JpaFeedOpsAclEntry;
 import com.thinkbiganalytics.security.AccessController;
 import com.thinkbiganalytics.security.GroupPrincipal;

diff --git a/core/sla/sla-core/pom.xml b/core/sla/sla-core/pom.xml
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>
-      <artifactId>kylo-commons-util</artifactId>
+      <artifactId>kylo-commons-spring</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/install/install-tar/pom.xml b/install/install-tar/pom.xml
@@ -141,6 +141,11 @@
       <artifactId>kylo-schema-discovery-default</artifactId>
       <version>0.10.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>
       <artifactId>kylo-service-app</artifactId>

diff --git a/integrations/nifi/nifi-nar-bundles/nifi-teradata-tdch-bundle/nifi-teradata-tdch-core/pom.xml b/integrations/nifi/nifi-nar-bundles/nifi-teradata-tdch-bundle/nifi-teradata-tdch-core/pom.xml
@@ -61,7 +61,8 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/plugins/schema-discovery-default/pom.xml b/plugins/schema-discovery-default/pom.xml
@@ -27,6 +27,11 @@
       <artifactId>kylo-commons-util</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>

diff --git a/...in/java/com/thinkbiganalytics/discovery/parsers/hadoop/AbstractSparkFileSchemaParser.java b/...in/java/com/thinkbiganalytics/discovery/parsers/hadoop/AbstractSparkFileSchemaParser.java
@@ -33,7 +33,6 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 /**

diff --git a/plugins/spark-shell-server/pom.xml b/plugins/spark-shell-server/pom.xml
@@ -22,6 +22,12 @@
       <artifactId>kylo-commons-rest-client</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>
       <artifactId>kylo-commons-spark-shell-plugin-shared</artifactId>

diff --git a/...ntroller/src/main/java/com/thinkbiganalytics/feedmgr/nifi/PropertyExpressionResolver.java b/...ntroller/src/main/java/com/thinkbiganalytics/feedmgr/nifi/PropertyExpressionResolver.java
@@ -31,9 +31,6 @@
 import com.thinkbiganalytics.nifi.rest.model.NifiProperty;
 import com.thinkbiganalytics.spring.SpringEnvironmentProperties;
 
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.apache.commons.beanutils.ConvertUtilsBean;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.text.StrLookup;
 import org.apache.commons.lang.text.StrSubstitutor;
@@ -52,7 +49,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.naming.spi.ResolveResult;
 
 /**
  * Resolves the values for NiFi processor properties using the following logic:

diff --git a/services/schema-discovery-service/schema-discovery-controller/pom.xml b/services/schema-discovery-service/schema-discovery-controller/pom.xml
@@ -29,6 +29,11 @@
       <artifactId>kylo-ui-annotation-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>

diff --git a/services/thrift-proxy-service/thrift-proxy-core/pom.xml b/services/thrift-proxy-service/thrift-proxy-core/pom.xml
@@ -33,6 +33,11 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.thinkbiganalytics.kylo</groupId>

diff --git a/...roxy-core/src/test/java/com/thinkbiganalytics/hive/service/RefreshableDataSourceTest.java b/...roxy-core/src/test/java/com/thinkbiganalytics/hive/service/RefreshableDataSourceTest.java
@@ -23,21 +23,17 @@
 import com.thinkbiganalytics.UsernameCaseStrategyUtil;
 import com.thinkbiganalytics.kerberos.KerberosTicketConfiguration;
 import com.thinkbiganalytics.kerberos.KerberosUtil;
-import com.thinkbiganalytics.scheduler.util.CronExpressionUtil;
 
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.core.env.Environment;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;

diff --git a/ui/ui-controller/pom.xml b/ui/ui-controller/pom.xml
@@ -28,6 +28,11 @@
       <artifactId>kylo-ui-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.thinkbiganalytics.kylo</groupId>
+      <artifactId>kylo-commons-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <!-- Jersey -->
     <dependency>

diff --git a/ui/ui-controller/src/main/java/com/thinkbiganalytics/ui/config/UiSpringConfiguration.java b/ui/ui-controller/src/main/java/com/thinkbiganalytics/ui/config/UiSpringConfiguration.java
@@ -26,8 +26,6 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  *

diff --git a/ui/ui-controller/src/main/java/com/thinkbiganalytics/ui/rest/SpringJerseyConfiguration.java b/ui/ui-controller/src/main/java/com/thinkbiganalytics/ui/rest/SpringJerseyConfiguration.java
@@ -24,13 +24,10 @@
 
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.glassfish.jersey.servlet.ServletProperties;
-import org.springframework.boot.autoconfigure.jersey.JerseyProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.inject.Inject;
-
 @Configuration
 public class SpringJerseyConfiguration {