Skip to content

Commit 12f2ea5

Browse files
flora-jinflora-jin
authored
Updated major version to be retrieved dynamically on gremlin console and server. Also added unit test for new method added in Gremlin.java. Updated ImportGremlinPluginTest to accommodate added method. (#2982)
1 parent 7824c4e commit 12f2ea5

File tree

10 files changed

+33
-20
lines changed

10 files changed

+33
-20
lines changed

‎README.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $ bin/gremlin.sh
6060
6161
\,,,/
6262
(o o)
63-
-----oOOo-(3)-oOOo-----
63+
-----oOOo-(4)-oOOo-----
6464
plugin activated: tinkerpop.server
6565
plugin activated: tinkerpop.utilities
6666
plugin activated: tinkerpop.tinkergraph

‎docs/src/reference/gremlin-applications.asciidoc

+8-8
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ $ bin/gremlin.sh
7878
7979
\,,,/
8080
(o o)
81-
-----oOOo-(3)-oOOo-----
81+
-----oOOo-(4)-oOOo-----
8282
plugin loaded: tinkerpop.server
8383
plugin loaded: tinkerpop.utilities
8484
plugin loaded: tinkerpop.tinkergraph
@@ -350,7 +350,7 @@ $ bin/gremlin.sh -i init.groovy
350350
351351
\,,,/
352352
(o o)
353-
-----oOOo-(3)-oOOo-----
353+
-----oOOo-(4)-oOOo-----
354354
plugin activated: tinkerpop.server
355355
plugin activated: tinkerpop.utilities
356356
plugin activated: tinkerpop.tinkergraph
@@ -382,7 +382,7 @@ INFO: Created user preferences directory.
382382
383383
\,,,/
384384
(o o)
385-
-----oOOo-(3)-oOOo-----
385+
-----oOOo-(4)-oOOo-----
386386
plugin activated: tinkerpop.server
387387
plugin activated: tinkerpop.utilities
388388
plugin activated: tinkerpop.tinkergraph
@@ -440,7 +440,7 @@ $ bin/gremlin-server.sh conf/gremlin-server-modern.yaml
440440
[INFO] GremlinServer
441441
\,,,/
442442
(o o)
443-
-----oOOo-(3)-oOOo-----
443+
-----oOOo-(4)-oOOo-----
444444
445445
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-modern.yaml
446446
[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
@@ -599,7 +599,7 @@ $ bin/gremlin.sh
599599
600600
\,,,/
601601
(o o)
602-
-----oOOo-(3)-oOOo-----
602+
-----oOOo-(4)-oOOo-----
603603
gremlin>
604604
----
605605
@@ -1139,7 +1139,7 @@ $ bin/gremlin-server.sh conf/gremlin-server-secure.yaml
11391139
[INFO] GremlinServer -
11401140
\,,,/
11411141
(o o)
1142-
-----oOOo-(3)-oOOo-----
1142+
-----oOOo-(4)-oOOo-----
11431143
11441144
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-secure.yaml
11451145
...
@@ -1172,7 +1172,7 @@ $ bin/gremlin-server.sh conf/gremlin-server-rest-secure.yaml
11721172
[INFO] GremlinServer -
11731173
\,,,/
11741174
(o o)
1175-
-----oOOo-(3)-oOOo-----
1175+
-----oOOo-(4)-oOOo-----
11761176
11771177
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-secure.yaml
11781178
...
@@ -2125,7 +2125,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
21252125
[INFO] GremlinServer -
21262126
\,,,/
21272127
(o o)
2128-
-----oOOo-(3)-oOOo-----
2128+
-----oOOo-(4)-oOOo-----
21292129
21302130
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
21312131
...

‎docs/src/reference/implementations-hadoop-start.asciidoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $ bin/gremlin.sh
4848
4949
\,,,/
5050
(o o)
51-
-----oOOo-(3)-oOOo-----
51+
-----oOOo-(4)-oOOo-----
5252
plugin activated: tinkerpop.server
5353
plugin activated: tinkerpop.utilities
5454
plugin activated: tinkerpop.tinkergraph
@@ -59,7 +59,7 @@ $ bin/gremlin.sh
5959
6060
\,,,/
6161
(o o)
62-
-----oOOo-(3)-oOOo-----
62+
-----oOOo-(4)-oOOo-----
6363
plugin activated: tinkerpop.server
6464
plugin activated: tinkerpop.utilities
6565
plugin activated: tinkerpop.tinkergraph
@@ -177,7 +177,7 @@ $ bin/gremlin.sh
177177
178178
\,,,/
179179
(o o)
180-
-----oOOo-(3)-oOOo-----
180+
-----oOOo-(4)-oOOo-----
181181
plugin activated: tinkerpop.server
182182
plugin activated: tinkerpop.utilities
183183
plugin activated: tinkerpop.tinkergraph
@@ -189,7 +189,7 @@ $ bin/gremlin.sh
189189
190190
\,,,/
191191
(o o)
192-
-----oOOo-(3)-oOOo-----
192+
-----oOOo-(4)-oOOo-----
193193
plugin activated: tinkerpop.server
194194
plugin activated: tinkerpop.utilities
195195
plugin activated: tinkerpop.tinkergraph

‎docs/src/reference/intro.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ $ bin/gremlin.sh
219219
220220
\,,,/
221221
(o o)
222-
-----oOOo-(3)-oOOo-----
222+
-----oOOo-(4)-oOOo-----
223223
gremlin> graph = TinkerFactory.createModern() // <1>
224224
==>tinkergraph[vertices:6 edges:6]
225225
gremlin> g = traversal().with(graph) // <2>

‎docs/src/tutorials/getting-started/index.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $ bin/gremlin.sh
6565
6666
\,,,/
6767
(o o)
68-
-----oOOo-(3)-oOOo-----
68+
-----oOOo-(4)-oOOo-----
6969
plugin activated: tinkerpop.server
7070
plugin activated: tinkerpop.utilities
7171
plugin activated: tinkerpop.tinkergraph

‎gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Console {
7474
io.out.println()
7575
io.out.println(" " + Colorizer.render(Preferences.gremlinColor, "\\,,,/"))
7676
io.out.println(" " + Colorizer.render(Preferences.gremlinColor, "(o o)"))
77-
io.out.println("" + Colorizer.render(Preferences.gremlinColor, "-----oOOo-(3)-oOOo-----"))
77+
io.out.println("" + Colorizer.render(Preferences.gremlinColor, "-----oOOo-(" + Gremlin.majorVersion() + ")-oOOo-----"))
7878
}
7979

8080
final Mediator mediator = new Mediator(this)

‎gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ public static String version() {
3737
return gremlinVersion;
3838
}
3939

40+
/**
41+
* Gets the current major version of tinkerpop.
42+
*/
43+
public static String majorVersion() { return version().split("\\.")[0]; }
44+
4045
public static void main(final String[] arguments) throws IOException {
4146
System.out.println("gremlin " + version());
4247
}

‎gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ImportGremlinPluginTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,17 @@ public void shouldImportClass() {
6161

6262
@Test
6363
public void shouldImportWildcardMethod() throws Exception {
64-
final Method zeroArgs = Gremlin.class.getMethod("version");
64+
final Method version = Gremlin.class.getMethod("version");
65+
final Method majorVersion = Gremlin.class.getMethod("majorVersion");
6566
final ImportGremlinPlugin module = ImportGremlinPlugin.build()
6667
.methodImports(Collections.singletonList(Gremlin.class.getCanonicalName() + "#*")).create();
6768

6869
final DefaultImportCustomizer customizer = (DefaultImportCustomizer) module.getCustomizers().get()[0];
6970
assertEquals(1, module.getCustomizers().get().length);
70-
assertThat(customizer.getMethodImports(), hasItems(zeroArgs));
71+
assertThat(customizer.getMethodImports(), hasItems(version, majorVersion));
7172

7273
// will also have the static main() method
73-
assertEquals(2, customizer.getMethodImports().size());
74+
assertEquals(3, customizer.getMethodImports().size());
7475
}
7576

7677
@Test

‎gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/GremlinTest.java

+7
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,11 @@ public void shouldGetVersion() {
4343
assertTrue("Minor version should be a positive int", Integer.parseInt(version[1]) >= 0);
4444
assertTrue("Patch version should be a positive int", Integer.parseInt(version[2]) >= 0);
4545
}
46+
47+
@Test
48+
public void shouldGetMajorVersion() {
49+
String majorVersion = Gremlin.majorVersion();
50+
51+
assertTrue("Major version should be greater than 3", Integer.parseInt(majorVersion) > 3);
52+
}
4653
}

‎gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public static String getHeader() {
390390
builder.append(Gremlin.version() + "\r\n");
391391
builder.append(" \\,,,/\r\n");
392392
builder.append(" (o o)\r\n");
393-
builder.append("-----oOOo-(3)-oOOo-----\r\n");
393+
builder.append("-----oOOo-(" + Gremlin.majorVersion() + ")-oOOo-----\r\n");
394394
return builder.toString();
395395
}
396396

0 commit comments

Comments
 (0)