You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2017/04/02 12:40:53 UTC
svn commit: r1789879 - in /directory/shared/trunk/ldap:
model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/
model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/
schema/data/src/test/java/org/apache/directo...
Author: seelmann
Date: Sun Apr 2 12:40:53 2017
New Revision: 1789879
URL: http://svn.apache.org/viewvc?rev=1789879&view=rev
Log:
Fix syntax checkers initialization when loaded via DefaultSchemaManager
Added:
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java (with props)
Modified:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/FacsimileTelephoneNumberSyntaxCheckerTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/TelephoneNumberSyntaxCheckerTest.java
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java?rev=1789879&r1=1789878&r2=1789879&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java Sun Apr 2 12:40:53 2017
@@ -59,11 +59,11 @@ public final class FacsimileTelephoneNum
/** The default pattern used to check a TelephoneNumber */
private static final String DEFAULT_REGEXP = "^ *[+]? *((\\([0-9- ,;/#*]+\\))|[0-9- ,;/#*]+)+$";
- /** The compiled default pattern */
- private String defaultRegexp;
+ /** The default pattern */
+ private final String defaultRegexp;
/** The compiled default pattern */
- private Pattern defaultPattern = Pattern.compile( DEFAULT_REGEXP );
+ private Pattern defaultPattern;
/** Fax parameters possible values */
private static final String TWO_DIMENSIONAL = "twoDimensional";
@@ -112,9 +112,10 @@ public final class FacsimileTelephoneNum
private Builder()
{
super( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX );
+ setDefaultRegexp( DEFAULT_REGEXP );
}
-
-
+
+
/**
* Create a new instance of FacsimileTelephoneNumberSyntaxChecker
* @return A new instance of FacsimileTelephoneNumberSyntaxChecker
@@ -149,28 +150,28 @@ public final class FacsimileTelephoneNum
}
}
-
+
/**
* Creates a new instance of TelephoneNumberSyntaxChecker.
*/
private FacsimileTelephoneNumberSyntaxChecker( String oid )
{
- super( oid );
+ this( oid, DEFAULT_REGEXP, Pattern.compile( DEFAULT_REGEXP ) );
}
-
+
/**
* Creates a new instance of TelephoneNumberSyntaxChecker.
*/
private FacsimileTelephoneNumberSyntaxChecker( String oid, String defaultRegexp, Pattern defaultPattern )
{
super( oid );
-
+
this.defaultPattern = defaultPattern;
this.defaultRegexp = defaultRegexp;
}
-
+
/**
* @return An instance of the Builder for this class
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java?rev=1789879&r1=1789878&r2=1789879&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java Sun Apr 2 12:40:53 2017
@@ -50,11 +50,11 @@ public final class TelephoneNumberSyntax
/** The default pattern used to check a TelephoneNumber */
private static final String DEFAULT_REGEXP = "^ *[+]? *((\\([0-9- ,;/#*]+\\))|[0-9- ,;/#*]+)+$";
- /** The compiled default pattern */
- private String defaultRegexp;
+ /** The default pattern */
+ private final String defaultRegexp;
/** The compiled default pattern */
- private Pattern defaultPattern = Pattern.compile( DEFAULT_REGEXP );
+ private final Pattern defaultPattern;
/**
* A static instance of TelephoneNumberSyntaxChecker
@@ -67,7 +67,7 @@ public final class TelephoneNumberSyntax
*/
public static final class Builder extends SCBuilder<TelephoneNumberSyntaxChecker>
{
- /** The compiled default pattern */
+ /** The default pattern */
private String defaultRegexp;
/** The compiled default pattern */
@@ -79,6 +79,7 @@ public final class TelephoneNumberSyntax
private Builder()
{
super( SchemaConstants.TELEPHONE_NUMBER_SYNTAX );
+ setDefaultRegexp( DEFAULT_REGEXP );
}
@@ -124,7 +125,7 @@ public final class TelephoneNumberSyntax
*/
private TelephoneNumberSyntaxChecker( String oid )
{
- super( oid );
+ this( oid, DEFAULT_REGEXP, Pattern.compile( DEFAULT_REGEXP ) );
}
@@ -138,7 +139,7 @@ public final class TelephoneNumberSyntax
private TelephoneNumberSyntaxChecker( String oid, String defaultRegexp, Pattern defaultPattern )
{
super( oid );
-
+
this.defaultPattern = defaultPattern;
this.defaultRegexp = defaultRegexp;
}
@@ -160,14 +161,7 @@ public final class TelephoneNumberSyntax
*/
public String getRegexp()
{
- if ( defaultRegexp == null )
- {
- return DEFAULT_REGEXP;
- }
- else
- {
- return defaultRegexp;
- }
+ return defaultRegexp;
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/FacsimileTelephoneNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/FacsimileTelephoneNumberSyntaxCheckerTest.java?rev=1789879&r1=1789878&r2=1789879&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/FacsimileTelephoneNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/FacsimileTelephoneNumberSyntaxCheckerTest.java Sun Apr 2 12:40:53 2017
@@ -27,6 +27,7 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.FacsimileTelephoneNumberSyntaxChecker;
+import org.apache.directory.api.ldap.model.schema.syntaxCheckers.TelephoneNumberSyntaxChecker;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -101,6 +102,14 @@ public class FacsimileTelephoneNumberSyn
}
+ @Test
+ public void testBuilderSetsDefaultPattern()
+ {
+ checker = FacsimileTelephoneNumberSyntaxChecker.builder().build();
+ assertTrue( checker.isValidSyntax( "1" ) );
+ }
+
+
@Test
public void testCorrectTelephoneNumberAndFaxParam()
{
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/TelephoneNumberSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/TelephoneNumberSyntaxCheckerTest.java?rev=1789879&r1=1789878&r2=1789879&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/TelephoneNumberSyntaxCheckerTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/TelephoneNumberSyntaxCheckerTest.java Sun Apr 2 12:40:53 2017
@@ -107,4 +107,13 @@ public class TelephoneNumberSyntaxChecke
assertTrue( checker.isValidSyntax( " 01/02/03/04/05 " ) );
assertFalse( checker.isValidSyntax( " 01 / 02 .03 04-- 05 " ) );
}
+
+
+ @Test
+ public void testBuilderSetsDefaultPattern()
+ {
+ checker = TelephoneNumberSyntaxChecker.builder().build();
+ assertTrue( checker.isValidSyntax( "1" ) );
+ }
+
}
Added: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java?rev=1789879&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java (added)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java Sun Apr 2 12:40:53 2017
@@ -0,0 +1,51 @@
+/*
+ * 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.directory.api.ldap.schema.manager.impl;
+
+
+import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
+import org.junit.Test;
+
+
+/**
+ * Tests the DefaultSchemaManager.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DefaultSchemaManagerTest
+{
+
+ /**
+ * Verifies that all syntax checkers are properly initialized
+ * when loading the default schema.
+ */
+ @Test
+ public void testSyntaxCheckersDoNotThrowException() throws Exception
+ {
+ DefaultSchemaManager schemaManager = new DefaultSchemaManager();
+ schemaManager.loadAllEnabled();
+
+ for ( SyntaxChecker sc : schemaManager.getSyntaxCheckerRegistry() )
+ {
+ sc.isValidSyntax( "foo" );
+ }
+ }
+
+}
Propchange: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native