Skip to content

Commit c814c32

Browse files
shs96cshs96c
committed
Move UrlTemplate to the o.o.s.grid.web package
1 parent a6b9846 commit c814c32

6 files changed

Lines changed: 17 additions & 5 deletions

File tree

java/server/src/org/openqa/selenium/remote/server/UrlTemplate.java renamed to java/server/src/org/openqa/selenium/grid/web/UrlTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.remote.server;
18+
package org.openqa.selenium.grid.web;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -28,7 +28,7 @@
2828
/**
2929
* An incredibly bad implementation of URL Templates, but enough for our needs.
3030
*/
31-
class UrlTemplate {
31+
public class UrlTemplate {
3232

3333
private final static Pattern GROUP_NAME = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>");
3434
private final List<Matches> template;

‎java/server/src/org/openqa/selenium/remote/server/AllHandlers.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.common.collect.ImmutableMap;
2424

2525
import org.openqa.selenium.grid.web.CommandHandler;
26+
import org.openqa.selenium.grid.web.UrlTemplate;
2627
import org.openqa.selenium.injector.Injector;
2728
import org.openqa.selenium.json.Json;
2829
import org.openqa.selenium.remote.SessionId;

‎java/server/src/org/openqa/selenium/remote/server/BUCK‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ java_library(
8383
'SessionCodec.java',
8484
'SessionFactory.java',
8585
'TeeReader.java',
86-
'UrlTemplate.java',
8786
'WebDriverServlet.java',
8887
] + glob(['commandhandler/*.java']),
8988
provided_deps = [

‎java/server/test/org/openqa/selenium/grid/web/BUCK‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# BUILD FILE SYNTAX: SKYLARK
2+
3+
java_test(
4+
name = "web",
5+
labels = [ "small" ],
6+
srcs = glob(["*.java"]),
7+
deps = [
8+
"//java/server/src/org/openqa/selenium/grid/web:web",
9+
"//third_party/java/guava:guava",
10+
"//third_party/java/junit:junit",
11+
],
12+
)

java/server/test/org/openqa/selenium/remote/server/UrlTemplateTest.java renamed to java/server/test/org/openqa/selenium/grid/web/UrlTemplateTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.remote.server;
18+
package org.openqa.selenium.grid.web;
1919

2020
import static org.junit.Assert.assertEquals;
2121
import static org.junit.Assert.assertNull;
@@ -24,6 +24,7 @@
2424
import com.google.common.collect.ImmutableMap;
2525

2626
import org.junit.Test;
27+
import org.openqa.selenium.grid.web.UrlTemplate;
2728

2829
public class UrlTemplateTest {
2930

‎java/server/test/org/openqa/selenium/remote/server/RemoteServerTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
TeeReaderTest.class,
4949
UploadFileTest.class,
5050
org.openqa.selenium.remote.server.commandhandler.UploadFileTest.class,
51-
UrlTemplateTest.class,
5251
UtilsTest.class,
5352
WebDriverServletTest.class
5453
})

0 commit comments

Comments
 (0)