Skip to content

Fixed regular expressions to be able to handle prefixed pathes. #37

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

Open
k-oliver wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed regular expressions to be able to handle prefixed pathes. #37

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
8 changes: 4 additions & 4 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/server/CollectionPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2006 Open Source Applications Foundation
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -40,7 +40,7 @@ public class CollectionPath {
private static final Log LOG = LogFactory.getLog(CollectionPath.class);

private static final Pattern PATTERN_COLLECTION_UID =
Pattern.compile("^/collection/([^/]+)(/.*)?$");
Pattern.compile("^.*/collection/([^/]+)(/.*)?$");

private String urlPath;
private String uid;
Expand Down
8 changes: 4 additions & 4 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/server/ItemPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2006 Open Source Applications Foundation
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -40,7 +40,7 @@ public class ItemPath {
private static final Log LOG = LogFactory.getLog(ItemPath.class);

private static final Pattern PATTERN_ITEM_UID =
Pattern.compile("^/(item|expanded|detached)/([^/]+)(/.*)?$");
Pattern.compile("^.*/(item|expanded|detached)/([^/]+)(/.*)?$");

private String urlPath;
private String uid;
Expand Down
8 changes: 4 additions & 4 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/server/UserPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2006 Open Source Applications Foundation
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -40,7 +40,7 @@ public class UserPath {
private static final Log LOG = LogFactory.getLog(UserPath.class);

private static final Pattern PATTERN_USER_USERNAME =
Pattern.compile("^/user/([^/]+)(/.*)?$");
Pattern.compile("^.*/user/([^/]+)(/.*)?$");

private String urlPath;
private String username;
Expand Down