Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31E1D200CC5 for ; Mon, 26 Jun 2017 18:40:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 30DA4160BDE; Mon, 26 Jun 2017 16:40:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7ED62160BFC for ; Mon, 26 Jun 2017 18:40:31 +0200 (CEST) Received: (qmail 40322 invoked by uid 500); 26 Jun 2017 16:40:30 -0000 Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list dev@brooklyn.apache.org Received: (qmail 40032 invoked by uid 99); 26 Jun 2017 16:40:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jun 2017 16:40:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 453C1E041D; Mon, 26 Jun 2017 16:40:30 +0000 (UTC) From: geomacy To: dev@brooklyn.apache.org Reply-To: dev@brooklyn.apache.org References: In-Reply-To: Subject: [GitHub] brooklyn-server pull request #737: Clean up inference around parsing `name:v... Content-Type: text/plain Message-Id: <20170626164030.453C1E041D@git1-us-west.apache.org> Date: Mon, 26 Jun 2017 16:40:30 +0000 (UTC) archived-at: Mon, 26 Jun 2017 16:40:32 -0000 Github user geomacy commented on a diff in the pull request: https://github.com/apache/brooklyn-server/pull/737#discussion_r124014747 --- Diff: core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypeNaming.java --- @@ -0,0 +1,111 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.core.typereg; + +/** + * Methods for testing validity of names and decomposing them. + * Mostly based on OSGi, specifically sections 1.3.2 and 3.2.5 of + * osgi.core-4.3.0 spec (https://www.osgi.org/release-4-version-4-3-download/). */ +public class RegisteredTypeNaming { + + private static final String USABLE_REGEX = "[^:\\s/\\\\]+"; + + private final static String DOT = "\\."; + + public final static String OSGI_TOKEN_CHARS = "A-Za-z0-9_-"; + public final static String OSGI_TOKEN_REGEX = "[" + OSGI_TOKEN_CHARS + "]+"; + public final static String OSGI_SYMBOLIC_NAME_REGEX = OSGI_TOKEN_REGEX + "(" + DOT + OSGI_TOKEN_REGEX + ")*"; + public final static String NUMBER = "[0-9]+"; + public final static String QUALIFIER = OSGI_TOKEN_REGEX; + public final static String VERSION_REGEX = + NUMBER + + "(" + "\\." + NUMBER + --- End diff -- You've already defined `DOT`, might as well use it here. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---