Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor java client pom structure #936

Merged
merged 1 commit into from
Jul 29, 2015
Merged

refactor java client pom structure #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ site_test: unit_test site_integration_test

clean:
go clean -i ./go/...
rm -rf java/vtocc-client/target java/vtocc-jdbc-driver/target third_party/acolyte
rm -rf third_party/acolyte

unit_test:
godep go test $(VT_GO_PARALLEL) ./go/...
Expand Down Expand Up @@ -194,7 +194,7 @@ site_integration_test:
$(call run_integration_tests, $(site_integration_test_files))

java_vtgate_client_test:
mvn -f java/vtgate-client/pom.xml clean verify
mvn -f java/pom.xml clean verify

v3_test:
cd test && ./vtgatev3_test.py
Expand Down
50 changes: 7 additions & 43 deletions java/gorpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<parent>
<groupId>com.youtube.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.youtube.vitess</groupId>
<artifactId>gorpc-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
<distributionManagement>
<repository>
<id>repo</id>
<url>https://github.com/youtube/mvn-repo/raw/master/releases</url>
</repository>
<snapshotRepository>
<id>snapshot-repo</id>
<url>https://github.com/youtube/mvn-repo/raw/master/snapshots</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
Expand All @@ -36,21 +25,11 @@
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>2.12.3</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.2</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -68,24 +47,9 @@
<version>2.17</version>
<configuration>
<argLine>${surefireArgLine}</argLine>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.13</version>
<configuration>
<argLine>${failsafeArgLine}</argLine>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion java/gorpc/src/main/java/com/youtube/vitess/gorpc/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private void writeRequest(String serviceMethod, Object args) throws GoRpcExcepti
if (isStreaming) {
throw new GoRpcException("request not allowed as client is in the middle of streaming");
}
seq = seq.add(UnsignedLong.ONE);
seq = seq.plus(UnsignedLong.ONE);
Request request = new Request(serviceMethod, seq);
try {
codec.WriteRequest(request, args);
Expand Down
2 changes: 1 addition & 1 deletion java/gorpc/src/main/java/com/youtube/vitess/gorpc/codecs/bson/GoRpcBsonDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public BSONObject readObject(InputStream in) throws IOException {

public static class GoRpcBSONCallBack extends BasicBSONCallback {
public void gotULong(final String name, final long v) {
final UnsignedLong ulv = UnsignedLong.asUnsigned(v);
final UnsignedLong ulv = UnsignedLong.fromLongBits(v);
_put(name, ulv);
}
}
Expand Down
2 changes: 1 addition & 1 deletion java/gorpc/src/test/java/com/youtube/vitess/gorpc/ClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void testUnsignedLongs() throws Exception {
BSONObject mArgs = new BasicBSONObject();
mArgs.put("Num", a);
Response response = client.call("Arith.Increment", mArgs);
Assert.assertEquals(a.add(UnsignedLong.ONE), (UnsignedLong) response.getReply());
Assert.assertEquals(a.plus(UnsignedLong.ONE), (UnsignedLong) response.getReply());
client.close();
}
}
3 changes: 2 additions & 1 deletion java/gorpc/src/test/java/com/youtube/vitess/gorpc/FakeGoServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ public void run() {
new ArithThread(clientSocket).start();
}
} catch (SocketException e) {
throw new RuntimeException(e);
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException(e);
}
}

Expand Down
30 changes: 28 additions & 2 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
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>
<groupId>com.github.youtube.vitess</groupId>
<groupId>com.youtube.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<url>https://github.com/youtube/vitess/</url>
<description>Umbrella project for all Java activities for Vitess</description>
<inceptionYear>2014</inceptionYear>
Expand Down Expand Up @@ -57,4 +57,30 @@
<archive>https://groups.google.com/forum/#!forum/vitess</archive>
</mailingList>
</mailingLists>

<!-- define dependency versions -->
<properties>
<guava.version>18.0</guava.version>
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
36 changes: 7 additions & 29 deletions java/vtgate-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<parent>
<groupId>com.youtube.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.youtube.vitess</groupId>
<artifactId>vtgate-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>
<repository>
<id>repo</id>
<url>https://github.com/youtube/mvn-repo/raw/master/releases</url>
</repository>
<snapshotRepository>
<id>snapshot-repo</id>
<url>https://github.com/youtube/mvn-repo/raw/master/snapshots</url>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>youtube-snapshots</id>
<url>https://github.com/youtube/mvn-repo/raw/master/snapshots</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.youtube.vitess</groupId>
<artifactId>gorpc-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down