Remove deprecated attributes from configuration

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

@@ -148,15 +148,7 @@ public final class Configuration {
      */
     private String includeRoot;
     private List<RepositoryInfo> repositories;
-    /**
-     * @deprecated This is kept around so not to break object deserialization
-     * but it is ignored and cannot be truly set. This should mean that the
-     * configuration is written leaving out this deprecated property; so after
-     * some time it can be retired with the expectation that zero or a
-     * miniscule number of production configurations still have this deprecated
-     * property.
-     */
-    private String urlPrefix;
+
     private boolean generateHtml;
     /**
      * Default projects will be used, when no project is selected and no project
@@ -187,17 +179,7 @@ public final class Configuration {
     private String webappLAF;
     private RemoteSCM remoteScmSupported;
     private boolean optimizeDatabase;
-    /**
-     * @deprecated This is kept around so not to break object de-serialization.
-     * <p>Anyone who is using `--lock on` will now be setting
-     * {@link #luceneLocking} and resetting this field back to its default
-     * value. This should mean that the configuration is written leaving out
-     * this deprecated property; so after some time it can be retired with the
-     * expectation that zero or a miniscule number of production configurations
-     * still have this deprecated property.
-     */
-    @Deprecated
-    private boolean usingLuceneLocking;
+
     private LuceneLockName luceneLocking = LuceneLockName.OFF;
     private boolean compressXref;
     private boolean indexVersionedFilesOnly;
@@ -477,12 +459,10 @@ public Configuration() {
         setStatisticsFilePath(null);
         //setTabSize(4);
         setTagsEnabled(false);
-        //urlPrefix's constant value is moved to RuntimeEnvironment.
         //setUserPage("http://www.myserver.org/viewProfile.jspa?username=");
         // Set to empty string so we can append it to the URL
         // unconditionally later.
         setUserPageSuffix("");
-        setUsingLuceneLocking(false);
         setVerbose(false);
         setWebappLAF("default");
     }
@@ -811,7 +791,7 @@ public void setDataRoot(String dataRoot) {
     }
 
     /**
-     * If {@link includeRoot} is not set, {@link dataRoot} will be returned.
+     * If {@link #includeRoot} is not set, {@link #dataRoot} will be returned.
      * @return web include root directory
      */
     public String getIncludeRoot() {
@@ -834,23 +814,6 @@ public void addRepositories(List<RepositoryInfo> repositories) {
         this.repositories.addAll(repositories);
     }
 
-    public String getUrlPrefix() {
-        return urlPrefix;
-    }
-
-    /**
-     * Formerly this allowed setting the URL prefix to be used for the Java
-     * class analyzer and for language cross-referencing (xref) when they
-     * created HTML links. Now, a static value is used and transformed as
-     * necessary to the servlet {@code contextPath} so that users can deploy
-     * OpenGrok as they like.
-     * @param urlPrefix ignored
-     */
-    @Deprecated
-    public void setUrlPrefix(String urlPrefix) {
-        // ignore the value
-    }
-
     public void setGenerateHtml(boolean generateHtml) {
         this.generateHtml = generateHtml;
     }
@@ -1026,23 +989,6 @@ public void setOptimizeDatabase(boolean optimizeDatabase) {
         this.optimizeDatabase = optimizeDatabase;
     }
 
-    @Deprecated
-    public boolean isUsingLuceneLocking() {
-        return LuceneLockName.SIMPLE.equals(luceneLocking) ||
-            LuceneLockName.ON.equals(luceneLocking);
-    }
-
-    @Deprecated
-    public boolean getUsingLuceneLocking() {
-        return isUsingLuceneLocking();
-    }
-
-    @Deprecated
-    public void setUsingLuceneLocking(boolean useLuceneLocking) {
-        setLuceneLocking(useLuceneLocking ? LuceneLockName.ON :
-            LuceneLockName.OFF);
-    }
-
     public LuceneLockName getLuceneLocking() {
         return luceneLocking;
     }
@@ -1053,8 +999,6 @@ public LuceneLockName getLuceneLocking() {
      */
     public void setLuceneLocking(LuceneLockName value) {
         this.luceneLocking = value;
-        // Set the following to default(boolean) regardless of `value'.
-        this.usingLuceneLocking = false;
     }
 
     public void setCompressXref(boolean compressXref) {