Nuria has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376333 )
Change subject: Move GraphiteClient from core to job
......................................................................
Move GraphiteClient from core to job
The GraphiteClient was only used in the refinery-job module, and was
the only piece of scala code in the refinery-core one. Moving it
allows us to remove scala dependencies in refinery-core, and makes
us create a 'connector' package in refinery-job, paving the way for
new classes to come.
Bug: T175163
Change-Id: Iee07232b773ee8fdc819c46dacf84f89c75b51ad
---
M refinery-core/pom.xml
M
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RESTBaseMetrics.scala
M
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataArticlePlaceholderMetrics.scala
M
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataSpecialEntityDataMetrics.scala
R
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/connectors/GraphiteClient.scala
5 files changed, 9 insertions(+), 57 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
jenkins-bot: Verified
Nuria: Looks good to me, approved
diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml
index ce8b957..209e71e 100644
--- a/refinery-core/pom.xml
+++ b/refinery-core/pom.xml
@@ -68,28 +68,13 @@
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest_2.10</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.github.nscala-time</groupId>
- <artifactId>nscala-time_2.10</artifactId>
- </dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>12.0</version>
- </dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>12.0</version>
+ </dependency>
+
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -99,39 +84,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
- <version>1.0</version>
- <configuration>
-
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <junitxml>.</junitxml>
- <filereports>WDF TestSuite.txt</filereports>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RESTBaseMetrics.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RESTBaseMetrics.scala
index 0bba736..9cd743a 100644
---
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RESTBaseMetrics.scala
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RESTBaseMetrics.scala
@@ -3,7 +3,7 @@
import org.apache.spark.sql.{DataFrame, SQLContext}
import org.apache.spark.{SparkConf, SparkContext}
import org.joda.time.DateTime
-import org.wikimedia.analytics.refinery.core.GraphiteClient
+import org.wikimedia.analytics.refinery.job.connectors.GraphiteClient
import scopt.OptionParser
/**
diff --git
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataArticlePlaceholderMetrics.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataArticlePlaceholderMetrics.scala
index c839d7a..e680683 100644
---
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataArticlePlaceholderMetrics.scala
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataArticlePlaceholderMetrics.scala
@@ -3,7 +3,7 @@
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
import org.joda.time.DateTime
-import org.wikimedia.analytics.refinery.core.GraphiteClient
+import org.wikimedia.analytics.refinery.job.connectors.GraphiteClient
import scopt.OptionParser
import scala.collection.mutable.Map;
diff --git
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataSpecialEntityDataMetrics.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataSpecialEntityDataMetrics.scala
index c0c72f4..97be350 100644
---
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataSpecialEntityDataMetrics.scala
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/WikidataSpecialEntityDataMetrics.scala
@@ -3,7 +3,7 @@
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
import org.joda.time.DateTime
-import org.wikimedia.analytics.refinery.core.GraphiteClient
+import org.wikimedia.analytics.refinery.job.connectors.GraphiteClient
import scopt.OptionParser
/**
diff --git
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/GraphiteClient.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/connectors/GraphiteClient.scala
similarity index 97%
rename from
refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/GraphiteClient.scala
rename to
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/connectors/GraphiteClient.scala
index 4b40835..b92ece1 100644
---
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/GraphiteClient.scala
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/connectors/GraphiteClient.scala
@@ -1,4 +1,4 @@
-package org.wikimedia.analytics.refinery.core
+package org.wikimedia.analytics.refinery.job.connectors
import java.io.OutputStream
import java.net.Socket
--
To view, visit https://gerrit.wikimedia.org/r/376333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee07232b773ee8fdc819c46dacf84f89c75b51ad
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal <j...@wikimedia.org>
Gerrit-Reviewer: Nuria <nu...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
