directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1695964 - in /directory/apacheds/trunk/core/src: checkstyle/ main/java/org/apache/directory/server/core/ main/java/org/apache/directory/server/core/security/
Date Fri, 14 Aug 2015 19:28:38 GMT
Author: seelmann
Date: Fri Aug 14 19:28:37 2015
New Revision: 1695964

URL: http://svn.apache.org/r1695964
Log:
Fix checkstyle issues

Added:
    directory/apacheds/trunk/core/src/checkstyle/
    directory/apacheds/trunk/core/src/checkstyle/suppressions.xml   (with props)
Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java

Added: directory/apacheds/trunk/core/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/checkstyle/suppressions.xml?rev=1695964&view=auto
==============================================================================
--- directory/apacheds/trunk/core/src/checkstyle/suppressions.xml (added)
+++ directory/apacheds/trunk/core/src/checkstyle/suppressions.xml Fri Aug 14 19:28:37 2015
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+  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.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+    <!-- Large files -->
+    <suppress files="org.apache.directory.server.core.DefaultDirectoryService" checks="FileLength"/>
+</suppressions>

Propchange: directory/apacheds/trunk/core/src/checkstyle/suppressions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/trunk/core/src/checkstyle/suppressions.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1695964&r1=1695963&r2=1695964&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Fri Aug 14 19:28:37 2015
@@ -42,8 +42,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.naming.directory.Attributes;
-
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
@@ -189,10 +187,10 @@ public class DefaultDirectoryService imp
 
     /** remove me after implementation is completed */
     private static final String PARTIAL_IMPL_WARNING =
-        "WARNING: the changelog is only partially operational and will revert\n" +
-            "state without consideration of who made the original change.  All reverting
" +
-            "changes are made by the admin user.\n Furthermore the used controls are not
at " +
-            "all taken into account";
+        "WARNING: the changelog is only partially operational and will revert\n"
+            + "state without consideration of who made the original change.  All reverting
"
+            + "changes are made by the admin user.\n Furthermore the used controls are not
at "
+            + "all taken into account";
 
     /** The delay to wait between each sync on disk */
     private long syncPeriodMillis;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1695964&r1=1695963&r2=1695964&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Fri Aug 14 19:28:37 2015
@@ -299,6 +299,9 @@ public class DefaultOperationManager imp
                     case ONELEVEL:
                         urlString.append( "one" );
                         break;
+
+                    default:
+                        throw new IllegalArgumentException( "Unexpected scope " + scope );
                 }
 
                 urls.add( urlString.toString() );
@@ -1376,16 +1379,10 @@ public class DefaultOperationManager imp
 
         ensureStarted();
 
-        try
-        {
-            // Call the Unbind method
-            Interceptor head = directoryService.getInterceptor( unbindContext.getNextInterceptor()
);
+        // Call the Unbind method
+        Interceptor head = directoryService.getInterceptor( unbindContext.getNextInterceptor()
);
 
-            head.unbind( unbindContext );
-        }
-        finally
-        {
-        }
+        head.unbind( unbindContext );
 
         if ( IS_DEBUG )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=1695964&r1=1695963&r2=1695964&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
Fri Aug 14 19:28:37 2015
@@ -58,8 +58,12 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class TlsKeyGenerator
+public final class TlsKeyGenerator
 {
+    private TlsKeyGenerator()
+    {
+    }
+
     private static final Logger LOG = LoggerFactory.getLogger( TlsKeyGenerator.class );
 
     public static final String TLS_KEY_INFO_OC = "tlsKeyInfo";



Mime
View raw message