maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csta...@apache.org
Subject [2/4] git commit: Refactored the ArtifactInfo so that it exposes getters and setters instead of public methods.
Date Sat, 28 Jun 2014 12:05:18 GMT
Refactored the ArtifactInfo so that it exposes getters and setters instead of public methods.


Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/687c2027
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/687c2027
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/687c2027

Branch: refs/heads/master
Commit: 687c20271183efce9a1e7cec2a5b421e55ade405
Parents: 5f9969c
Author: Martin Todorov <carlspring@gmail.com>
Authored: Fri Jun 27 22:23:33 2014 +0100
Committer: Martin Todorov <carlspring@gmail.com>
Committed: Fri Jun 27 22:23:33 2014 +0100

----------------------------------------------------------------------
 .../apache/maven/index/cli/NexusIndexerCli.java |   4 +-
 .../maven/index/ArtifactAvailability.java       |  74 ++++
 .../maven/index/ArtifactAvailablility.java      |  74 ----
 .../org/apache/maven/index/ArtifactInfo.java    | 421 +++++++++++++++++--
 .../index/DefaultArtifactContextProducer.java   |   8 +-
 .../maven/index/DefaultIndexerEngine.java       |   4 +-
 .../maven/index/DefaultIteratorResultSet.java   |   6 +-
 .../maven/index/DefaultScannerListener.java     |  14 +-
 .../apache/maven/index/DefaultSearchEngine.java |   8 +-
 .../UniqueGAArtifactFilterPostprocessor.java    |  10 +-
 .../archetype/AbstractArchetypeDataSource.java  |  10 +-
 .../index/context/DefaultIndexingContext.java   |   2 +-
 .../creator/JarFileContentsIndexCreator.java    |  18 +-
 .../MavenArchetypeArtifactInfoIndexCreator.java |   4 +-
 .../MavenPluginArtifactInfoIndexCreator.java    |  22 +-
 .../MinimalArtifactInfoIndexCreator.java        | 147 ++++---
 .../index/creator/OsgiArtifactIndexCreator.java | 101 +++--
 .../maven/index/search/grouping/GAGrouping.java |   2 +-
 .../index/search/grouping/GAVGrouping.java      |   4 +-
 .../maven/index/search/grouping/GGrouping.java  |   2 +-
 .../index/search/grouping/RGAVGrouping.java     |   4 +-
 .../maven/index/search/grouping/RGGrouping.java |   2 +-
 .../index/treeview/DefaultIndexTreeView.java    |  22 +-
 .../index/treeview/DefaultTreeNodeFactory.java  |  28 +-
 .../index/AbstractRepoNexusIndexerTest.java     |  32 +-
 .../apache/maven/index/ConcurrentUseTest.java   |   2 +-
 .../index/DefaultIndexNexusIndexerTest.java     |  54 +--
 .../maven/index/FullIndexNexusIndexerTest.java  |  76 ++--
 .../index/Index20081108RegressionTest.java      |  27 +-
 .../maven/index/Mindexer35NexusIndexerTest.java |  14 +-
 .../index/MinimalIndexNexusIndexerTest.java     |  12 +-
 .../maven/index/Nexus1179NexusIndexerTest.java  |  57 +--
 .../maven/index/Nexus13NexusIndexerTest.java    |  30 +-
 .../maven/index/Nexus2046NexusIndexerTest.java  |  18 +-
 .../maven/index/Nexus3233NexusIndexerTest.java  |  12 +-
 .../index/Nexus3293TimestampSnapshotTest.java   |   4 +-
 .../maven/index/Nexus645NexusIndexerTest.java   |  42 +-
 .../maven/index/Nexus658NexusIndexerTest.java   |  56 +--
 .../maven/index/Nexus687NexusIndexerTest.java   |   8 +-
 .../apache/maven/index/NexusIndexerTest.java    |  42 +-
 .../maven/index/UniqueArtifactFilterTest.java   |  15 +-
 .../JarFileContentsIndexCreatorTest.java        |   8 +-
 ...MavenPluginArtifactInfoIndexCreatorTest.java |   8 +-
 .../creator/OsgiArtifactIndexCreatorTest.java   |  54 +--
 .../index/updater/DefaultIndexUpdaterTest.java  |   2 +-
 45 files changed, 937 insertions(+), 627 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
----------------------------------------------------------------------
diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 4e15375..1f5e061 100644
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
+++ b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
@@ -561,10 +561,10 @@ public class NexusIndexerCli
 
             ArtifactInfo ai = ac.getArtifactInfo();
 
-            if ( !quiet && debug && "maven-plugin".equals( ai.packaging ) )
+            if ( !quiet && debug && "maven-plugin".equals( ai.getPackaging() ) )
             {
                 System.err.printf( "Plugin: %s:%s:%s - %s %s\n", //
-                    ai.groupId, ai.artifactId, ai.version, ai.prefix, "" + ai.goals );
+                    ai.getGroupId(), ai.getArtifactId(), ai.getVersion(), ai.getPrefix(), "" + ai.getGoals() );
             }
 
             if ( !quiet && ( debug || ( t - ts ) > 2000L ) )

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailability.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailability.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailability.java
new file mode 100644
index 0000000..c0d2af2
--- /dev/null
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailability.java
@@ -0,0 +1,74 @@
+package org.apache.maven.index;
+
+/*
+ * 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.
+ */
+
+/**
+ * Enumeration provides values indicating artifact availability
+ */
+public enum ArtifactAvailability
+{
+    /**
+     * Artifact is not present locally
+     */
+    NOT_PRESENT( 0 ),
+
+    /**
+     * Artifact is present locally
+     */
+    PRESENT( 1 ),
+
+    /**
+     * Artifact is not available
+     */
+    NOT_AVAILABLE( 2 );
+
+    private final int n;
+
+    private ArtifactAvailability( int n )
+    {
+        this.n = n;
+    }
+
+    @Override
+    public String toString()
+    {
+        return Integer.toString( n );
+    }
+
+    public static ArtifactAvailability fromString( String s )
+    {
+        try
+        {
+            switch ( Integer.parseInt( s ) )
+            {
+                case 1:
+                    return PRESENT;
+                case 2:
+                    return NOT_AVAILABLE;
+                default:
+                    return NOT_PRESENT;
+            }
+        }
+        catch ( NumberFormatException ex )
+        {
+            return NOT_PRESENT;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailablility.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailablility.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailablility.java
deleted file mode 100644
index 34f8907..0000000
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactAvailablility.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.maven.index;
-
-/*
- * 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.
- */
-
-/**
- * Enumeration provides values indicating artifact availability
- */
-public enum ArtifactAvailablility
-{
-    /**
-     * Artifact is not present locally
-     */
-    NOT_PRESENT( 0 ),
-
-    /**
-     * Artifact is present locally
-     */
-    PRESENT( 1 ),
-
-    /**
-     * Artifact is not available
-     */
-    NOT_AVAILABLE( 2 );
-
-    private final int n;
-
-    private ArtifactAvailablility( int n )
-    {
-        this.n = n;
-    }
-
-    @Override
-    public String toString()
-    {
-        return Integer.toString( n );
-    }
-
-    public static ArtifactAvailablility fromString( String s )
-    {
-        try
-        {
-            switch ( Integer.parseInt( s ) )
-            {
-                case 1:
-                    return PRESENT;
-                case 2:
-                    return NOT_AVAILABLE;
-                default:
-                    return NOT_PRESENT;
-            }
-        }
-        catch ( NumberFormatException ex )
-        {
-            return NOT_PRESENT;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index baacb90..0aed31a 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -163,124 +163,124 @@ public class ArtifactInfo
 
     public static final Comparator<ArtifactInfo> CONTEXT_VERSION_COMPARATOR = new ContextVersionComparator();
 
-    public String fname;
+    private String fileName;
 
-    public String fextension;
+    private String fileExtension;
 
-    public String groupId;
+    private String groupId;
 
-    public String artifactId;
+    private String artifactId;
 
-    public String version;
+    private String version;
 
     private transient Version artifactVersion;
 
     private transient float luceneScore;
 
-    public String classifier;
+    private String classifier;
 
     /**
      * Artifact packaging for the main artifact and extension for secondary artifact (no classifier)
      */
-    public String packaging;
+    private String packaging;
 
-    public String name;
+    private String name;
 
-    public String description;
+    private String description;
 
-    public long lastModified = -1;
+    private long lastModified = -1;
 
-    public long size = -1;
+    private long size = -1;
 
-    public String md5;
+    private String md5;
 
-    public String sha1;
+    private String sha1;
 
-    public ArtifactAvailablility sourcesExists = ArtifactAvailablility.NOT_PRESENT;
+    private ArtifactAvailability sourcesExists = ArtifactAvailability.NOT_PRESENT;
 
-    public ArtifactAvailablility javadocExists = ArtifactAvailablility.NOT_PRESENT;
+    private ArtifactAvailability javadocExists = ArtifactAvailability.NOT_PRESENT;
 
-    public ArtifactAvailablility signatureExists = ArtifactAvailablility.NOT_PRESENT;
+    private ArtifactAvailability signatureExists = ArtifactAvailability.NOT_PRESENT;
 
-    public String classNames;
+    private String classNames;
 
-    public String repository;
+    private String repository;
 
-    public String path;
+    private String path;
 
-    public String remoteUrl;
+    private String remoteUrl;
 
-    public String context;
+    private String context;
 
     /**
      * Plugin goal prefix (only if packaging is "maven-plugin")
      */
-    public String prefix;
+    private String prefix;
 
     /**
      * Plugin goals (only if packaging is "maven-plugin")
      */
-    public List<String> goals;
+    private List<String> goals;
 
     /**
      * contains osgi metadata Bundle-Version if available
      * @since 4.1.2
      */
-    public String bundleVersion;
+    private String bundleVersion;
 
     /**
      * contains osgi metadata Bundle-SymbolicName if available
      * @since 4.1.2
      */
-    public String bundleSymbolicName;
+    private String bundleSymbolicName;
 
     /**
      * contains osgi metadata Export-Package if available
      * @since 4.1.2
      */
-    public String bundleExportPackage;
+    private String bundleExportPackage;
 
     /**
      * contains osgi metadata Export-Service if available
      * @since 4.1.2
      */
-    public String bundleExportService;
+    private String bundleExportService;
 
     /**
      * contains osgi metadata Bundle-Description if available
      * @since 4.1.2
      */
-    public String bundleDescription;
+    private String bundleDescription;
 
     /**
      * contains osgi metadata Bundle-Name if available
      * @since 4.1.2
      */
-    public String bundleName;
+    private String bundleName;
 
     /**
      * contains osgi metadata Bundle-License if available
      * @since 4.1.2
      */
-    public String bundleLicense;
+    private String bundleLicense;
 
     /**
      * contains osgi metadata Bundle-DocURL if available
      * @since 4.1.2
      */
-    public String bundleDocUrl;
+    private String bundleDocUrl;
 
     /**
      * contains osgi metadata Import-Package if available
      * @since 4.1.2
      */
-    public String bundleImportPackage;
+    private String bundleImportPackage;
 
     /**
      * contains osgi metadata Require-Bundle if available
      * @since 4.1.2
      */
-    public String bundleRequireBundle;
+    private String bundleRequireBundle;
 
     private String uinfo = null;
 
@@ -290,6 +290,7 @@ public class ArtifactInfo
 
     private final transient VersionScheme versionScheme;
 
+
     public ArtifactInfo()
     {
         versionScheme = new GenericVersionScheme();
@@ -361,9 +362,9 @@ public class ArtifactInfo
 
     public Gav calculateGav()
     {
-        return new Gav( groupId, artifactId, version, classifier, fextension, null, // snapshotBuildNumber
+        return new Gav( groupId, artifactId, version, classifier, fileExtension, null, // snapshotBuildNumber
             null, // snapshotTimeStamp
-            fname, // name
+            fileName, // name
             false, // hash
             null, // hashType
             false, // signature
@@ -669,4 +670,354 @@ public class ArtifactInfo
         }
     }
 
+    public String getFileName( )
+    {
+        return fileName;
+    }
+
+    public void setFileName( String fileName )
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileExtension( )
+    {
+        return fileExtension;
+    }
+
+    public void setFileExtension( String fileExtension )
+    {
+        this.fileExtension = fileExtension;
+    }
+
+    public String getGroupId( )
+    {
+        return groupId;
+    }
+
+    public void setGroupId( String groupId )
+    {
+        this.groupId = groupId;
+    }
+
+    public String getArtifactId( )
+    {
+        return artifactId;
+    }
+
+    public void setArtifactId( String artifactId )
+    {
+        this.artifactId = artifactId;
+    }
+
+    public String getVersion( )
+    {
+        return version;
+    }
+
+    public void setVersion( String version )
+    {
+        this.version = version;
+    }
+
+    public void setArtifactVersion( Version artifactVersion )
+    {
+        this.artifactVersion = artifactVersion;
+    }
+
+    public String getClassifier( )
+    {
+        return classifier;
+    }
+
+    public void setClassifier( String classifier )
+    {
+        this.classifier = classifier;
+    }
+
+    public String getPackaging( )
+    {
+        return packaging;
+    }
+
+    public void setPackaging( String packaging )
+    {
+        this.packaging = packaging;
+    }
+
+    public String getName( )
+    {
+        return name;
+    }
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+
+    public String getDescription( )
+    {
+        return description;
+    }
+
+    public void setDescription( String description )
+    {
+        this.description = description;
+    }
+
+    public long getLastModified( )
+    {
+        return lastModified;
+    }
+
+    public void setLastModified( long lastModified )
+    {
+        this.lastModified = lastModified;
+    }
+
+    public long getSize( )
+    {
+        return size;
+    }
+
+    public void setSize( long size )
+    {
+        this.size = size;
+    }
+
+    public String getMd5( )
+    {
+        return md5;
+    }
+
+    public void setMd5( String md5 )
+    {
+        this.md5 = md5;
+    }
+
+    public String getSha1( )
+    {
+        return sha1;
+    }
+
+    public void setSha1( String sha1 )
+    {
+        this.sha1 = sha1;
+    }
+
+    public ArtifactAvailability getSourcesExists( )
+    {
+        return sourcesExists;
+    }
+
+    public void setSourcesExists( ArtifactAvailability sourcesExists )
+    {
+        this.sourcesExists = sourcesExists;
+    }
+
+    public ArtifactAvailability getJavadocExists( )
+    {
+        return javadocExists;
+    }
+
+    public void setJavadocExists( ArtifactAvailability javadocExists )
+    {
+        this.javadocExists = javadocExists;
+    }
+
+    public ArtifactAvailability getSignatureExists( )
+    {
+        return signatureExists;
+    }
+
+    public void setSignatureExists( ArtifactAvailability signatureExists )
+    {
+        this.signatureExists = signatureExists;
+    }
+
+    public String getClassNames( )
+    {
+        return classNames;
+    }
+
+    public void setClassNames( String classNames )
+    {
+        this.classNames = classNames;
+    }
+
+    public String getRepository( )
+    {
+        return repository;
+    }
+
+    public void setRepository( String repository )
+    {
+        this.repository = repository;
+    }
+
+    public String getPath( )
+    {
+        return path;
+    }
+
+    public void setPath( String path )
+    {
+        this.path = path;
+    }
+
+    public String getRemoteUrl( )
+    {
+        return remoteUrl;
+    }
+
+    public void setRemoteUrl( String remoteUrl )
+    {
+        this.remoteUrl = remoteUrl;
+    }
+
+    public String getContext( )
+    {
+        return context;
+    }
+
+    public void setContext( String context )
+    {
+        this.context = context;
+    }
+
+    public String getPrefix( )
+    {
+        return prefix;
+    }
+
+    public void setPrefix( String prefix )
+    {
+        this.prefix = prefix;
+    }
+
+    public List<String> getGoals( )
+    {
+        return goals;
+    }
+
+    public void setGoals( List<String> goals )
+    {
+        this.goals = goals;
+    }
+
+    public String getBundleVersion( )
+    {
+        return bundleVersion;
+    }
+
+    public void setBundleVersion( String bundleVersion )
+    {
+        this.bundleVersion = bundleVersion;
+    }
+
+    public String getBundleSymbolicName( )
+    {
+        return bundleSymbolicName;
+    }
+
+    public void setBundleSymbolicName( String bundleSymbolicName )
+    {
+        this.bundleSymbolicName = bundleSymbolicName;
+    }
+
+    public String getBundleExportPackage( )
+    {
+        return bundleExportPackage;
+    }
+
+    public void setBundleExportPackage( String bundleExportPackage )
+    {
+        this.bundleExportPackage = bundleExportPackage;
+    }
+
+    public String getBundleExportService( )
+    {
+        return bundleExportService;
+    }
+
+    public void setBundleExportService( String bundleExportService )
+    {
+        this.bundleExportService = bundleExportService;
+    }
+
+    public String getBundleDescription( )
+    {
+        return bundleDescription;
+    }
+
+    public void setBundleDescription( String bundleDescription )
+    {
+        this.bundleDescription = bundleDescription;
+    }
+
+    public String getBundleName( )
+    {
+        return bundleName;
+    }
+
+    public void setBundleName( String bundleName )
+    {
+        this.bundleName = bundleName;
+    }
+
+    public String getBundleLicense( )
+    {
+        return bundleLicense;
+    }
+
+    public void setBundleLicense( String bundleLicense )
+    {
+        this.bundleLicense = bundleLicense;
+    }
+
+    public String getBundleDocUrl( )
+    {
+        return bundleDocUrl;
+    }
+
+    public void setBundleDocUrl( String bundleDocUrl )
+    {
+        this.bundleDocUrl = bundleDocUrl;
+    }
+
+    public String getBundleImportPackage( )
+    {
+        return bundleImportPackage;
+    }
+
+    public void setBundleImportPackage( String bundleImportPackage )
+    {
+        this.bundleImportPackage = bundleImportPackage;
+    }
+
+    public String getBundleRequireBundle( )
+    {
+        return bundleRequireBundle;
+    }
+
+    public void setBundleRequireBundle( String bundleRequireBundle )
+    {
+        this.bundleRequireBundle = bundleRequireBundle;
+    }
+
+    public void setUinfo( String uinfo )
+    {
+        this.uinfo = uinfo;
+    }
+
+    public VersionScheme getVersionScheme( )
+    {
+        return versionScheme;
+    }
+
+    public void setFields( List<Field> fields )
+    {
+        this.fields = fields;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
index f4d6b13..b2f229a 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
@@ -111,13 +111,13 @@ public class DefaultArtifactContextProducer
         ArtifactInfo ai = new ArtifactInfo( context.getRepositoryId(), groupId, artifactId, version, classifier );
 
         // store extension if classifier is not empty
-        if ( !StringUtils.isEmpty( ai.classifier ) )
+        if ( !StringUtils.isEmpty( ai.getClassifier() ) )
         {
-            ai.packaging = gav.getExtension();
+            ai.setPackaging( gav.getExtension() );
         }
 
-        ai.fname = file.getName();
-        ai.fextension = gav.getExtension();
+        ai.setFileName( file.getName() );
+        ai.setFileExtension( gav.getExtension() );
 
         File metadata = ml.locate( pom );
 

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
index 6efe8d9..c961c7f 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
@@ -190,9 +190,9 @@ public class DefaultIndexerEngine
         }
 
         Set<String> allGroups = context.getAllGroups();
-        if ( !allGroups.contains( ac.getArtifactInfo().groupId ) )
+        if ( !allGroups.contains( ac.getArtifactInfo().getGroupId() ) )
         {
-            allGroups.add( ac.getArtifactInfo().groupId );
+            allGroups.add( ac.getArtifactInfo().getGroupId() );
             context.setAllGroups( allGroups );
         }
     }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
index 85410d8..53876d3 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
@@ -236,9 +236,9 @@ public class DefaultIteratorResultSet
 
                 result.setLuceneScore( hits.scoreDocs[pointer].score );
 
-                result.repository = context.getRepositoryId();
+                result.setRepository( context.getRepositoryId() );
 
-                result.context = context.getId();
+                result.setContext( context.getId() );
 
                 if ( filter != null )
                 {
@@ -351,7 +351,7 @@ public class DefaultIteratorResultSet
      * @param context
      * @param hr
      * @param field
-     * @param doc
+     * @param text
      * @return
      * @throws IOException
      */

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
index 5a277fc..109e085 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
@@ -138,7 +138,7 @@ public class DefaultScannerListener
             }
 
             groups.add( ac.getArtifactInfo().getRootGroup() );
-            allGroups.add( ac.getArtifactInfo().groupId );
+            allGroups.add( ac.getArtifactInfo().getGroupId() );
 
             count++;
         }
@@ -270,22 +270,22 @@ public class DefaultScannerListener
 
                     ArtifactInfo ai = new ArtifactInfo();
 
-                    ai.repository = context.getRepositoryId();
+                    ai.setRepository( context.getRepositoryId() );
 
-                    ai.groupId = ra[0];
+                    ai.setGroupId( ra[0] );
 
-                    ai.artifactId = ra[1];
+                    ai.setArtifactId( ra[1] );
 
-                    ai.version = ra[2];
+                    ai.setVersion( ra[2] );
 
                     if ( ra.length > 3 )
                     {
-                        ai.classifier = ArtifactInfo.renvl( ra[3] );
+                        ai.setClassifier( ArtifactInfo.renvl( ra[3] ) );
                     }
 
                     if ( ra.length > 4 )
                     {
-                        ai.packaging = ArtifactInfo.renvl( ra[4] );
+                        ai.setPackaging( ArtifactInfo.renvl( ra[4] ) );
                     }
 
                     // minimal ArtifactContext for removal

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java
index 85c443c..759eeb9 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java
@@ -160,8 +160,8 @@ public class DefaultSearchEngine
 
                     if ( artifactInfo != null )
                     {
-                        artifactInfo.repository = context.getRepositoryId();
-                        artifactInfo.context = context.getId();
+                        artifactInfo.setRepository( context.getRepositoryId() );
+                        artifactInfo.setContext( context.getId() );
 
                         if ( req.getArtifactInfoFilter() != null )
                         {
@@ -215,8 +215,8 @@ public class DefaultSearchEngine
 
                         if ( artifactInfo != null )
                         {
-                            artifactInfo.repository = context.getRepositoryId();
-                            artifactInfo.context = context.getId();
+                            artifactInfo.setRepository( context.getRepositoryId() );
+                            artifactInfo.setContext( context.getId() );
 
                             if ( req.getArtifactInfoFilter() != null )
                             {

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/UniqueGAArtifactFilterPostprocessor.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/UniqueGAArtifactFilterPostprocessor.java b/indexer-core/src/main/java/org/apache/maven/index/UniqueGAArtifactFilterPostprocessor.java
index 6e21300..cbdfa8e 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/UniqueGAArtifactFilterPostprocessor.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/UniqueGAArtifactFilterPostprocessor.java
@@ -47,11 +47,11 @@ public class UniqueGAArtifactFilterPostprocessor
 
     public boolean accepts( IndexingContext ctx, ArtifactInfo ai )
     {
-        String key = ai.groupId + ai.artifactId + ai.packaging + ai.classifier;
+        String key = ai.getGroupId() + ai.getArtifactId() + ai.getPackaging() + ai.getClassifier();
 
         if ( !repositoriesIgnored )
         {
-            key = ai.repository + key;
+            key = ai.getRepository() + key;
         }
 
         if ( gas.contains( key ) )
@@ -70,13 +70,13 @@ public class UniqueGAArtifactFilterPostprocessor
 
     public void postprocess( IndexingContext ctx, ArtifactInfo ai )
     {
-        ai.version = VERSION_LATEST;
+        ai.setVersion( VERSION_LATEST );
 
         if ( repositoriesIgnored )
         {
-            ai.context = null;
+            ai.setContext( null );
 
-            ai.repository = null;
+            ai.setRepository( null );
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java b/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java
index f6ec695..8647ae9 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java
@@ -60,11 +60,11 @@ public abstract class AbstractArchetypeDataSource
             for ( ArtifactInfo info : searchResponse.getResults() )
             {
                 Archetype archetype = new Archetype();
-                archetype.setGroupId( info.groupId );
-                archetype.setArtifactId( info.artifactId );
-                archetype.setVersion( info.version );
-                archetype.setDescription( info.description );
-                archetype.setRepository( repositories.get( info.repository ) );
+                archetype.setGroupId( info.getGroupId() );
+                archetype.setArtifactId( info.getArtifactId() );
+                archetype.setVersion( info.getVersion() );
+                archetype.setDescription( info.getDescription() );
+                archetype.setRepository( repositories.get( info.getRepository() ) );
                 catalog.addArchetype( archetype );
             }
         }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index dda3b18..4ab67be 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@ -715,7 +715,7 @@ public class DefaultIndexingContext
                 {
                     ArtifactInfo info = IndexUtils.constructArtifactInfo( d, this );
                     rootGroups.add( info.getRootGroup() );
-                    allGroups.add( info.groupId );
+                    allGroups.add( info.getGroupId() );
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java
index e43dbd4..b9ad35e 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java
@@ -82,18 +82,18 @@ public class JarFileContentsIndexCreator
 
     public void updateDocument( final ArtifactInfo ai, final Document doc )
     {
-        if ( ai.classNames != null )
+        if ( ai.getClassNames() != null )
         {
-            doc.add( FLD_CLASSNAMES_KW.toField( ai.classNames ) );
-            doc.add( FLD_CLASSNAMES.toField( ai.classNames ) );
+            doc.add( FLD_CLASSNAMES_KW.toField( ai.getClassNames() ) );
+            doc.add( FLD_CLASSNAMES.toField( ai.getClassNames() ) );
         }
     }
 
     public void updateLegacyDocument( final ArtifactInfo ai, final Document doc )
     {
-        if ( ai.classNames != null )
+        if ( ai.getClassNames() != null )
         {
-            String classNames = ai.classNames;
+            String classNames = ai.getClassNames();
 
             // downgrade the classNames if needed
             if ( classNames.length() > 0 && classNames.charAt( 0 ) == '/' )
@@ -121,7 +121,7 @@ public class JarFileContentsIndexCreator
         {
             if ( names.length() == 0 || names.charAt( 0 ) == '/' )
             {
-                artifactInfo.classNames = names;
+                artifactInfo.setClassNames( names );
             }
             else
             {
@@ -132,7 +132,7 @@ public class JarFileContentsIndexCreator
                 {
                     sb.append( '/' ).append( line ).append( '\n' );
                 }
-                artifactInfo.classNames = sb.toString();
+                artifactInfo.setClassNames( sb.toString() );
             }
 
             return true;
@@ -201,11 +201,11 @@ public class JarFileContentsIndexCreator
 
             if ( fieldValue.length() != 0 )
             {
-                ai.classNames = fieldValue;
+                ai.setClassNames( fieldValue );
             }
             else
             {
-                ai.classNames = null;
+                ai.setClassNames( null );
             }
         }
         finally

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java
index 350d015..639d5f9 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java
@@ -65,7 +65,7 @@ public class MavenArchetypeArtifactInfoIndexCreator
         ArtifactInfo ai = ac.getArtifactInfo();
 
         // we need the file to perform these checks, and those may be only JARs
-        if ( artifact != null && artifact.isFile() && !MAVEN_ARCHETYPE_PACKAGING.equals( ai.packaging )
+        if ( artifact != null && artifact.isFile() && !MAVEN_ARCHETYPE_PACKAGING.equals( ai.getPackaging() )
             && artifact.getName().endsWith( ".jar" ) )
         {
             // TODO: recheck, is the following true? "Maven plugins and Maven Archetypes can be only JARs?"
@@ -94,7 +94,7 @@ public class MavenArchetypeArtifactInfoIndexCreator
             {
                 if ( handle.hasEntry( path ) )
                 {
-                    ai.packaging = MAVEN_ARCHETYPE_PACKAGING;
+                    ai.setPackaging( MAVEN_ARCHETYPE_PACKAGING );
 
                     return;
                 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java
index 48e1a59..017a1a9 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java
@@ -77,7 +77,7 @@ public class MavenPluginArtifactInfoIndexCreator
         ArtifactInfo ai = ac.getArtifactInfo();
 
         // we need the file to perform these checks, and those may be only JARs
-        if ( artifact != null && MAVEN_PLUGIN_PACKAGING.equals( ai.packaging ) && artifact.getName().endsWith( ".jar" ) )
+        if ( artifact != null && MAVEN_PLUGIN_PACKAGING.equals( ai.getPackaging() ) && artifact.getName().endsWith( ".jar" ) )
         {
             // TODO: recheck, is the following true? "Maven plugins and Maven Archetypes can be only JARs?"
 
@@ -106,15 +106,15 @@ public class MavenPluginArtifactInfoIndexCreator
                     PlexusConfiguration plexusConfig =
                         new XmlPlexusConfiguration( Xpp3DomBuilder.build( new InputStreamReader( is ) ) );
 
-                    ai.prefix = plexusConfig.getChild( "goalPrefix" ).getValue();
+                    ai.setPrefix( plexusConfig.getChild( "goalPrefix" ).getValue() );
 
-                    ai.goals = new ArrayList<String>();
+                    ai.setGoals( new ArrayList<String>() );
 
                     PlexusConfiguration[] mojoConfigs = plexusConfig.getChild( "mojos" ).getChildren( "mojo" );
 
                     for ( PlexusConfiguration mojoConfig : mojoConfigs )
                     {
-                        ai.goals.add( mojoConfig.getChild( "goal" ).getValue() );
+                        ai.getGoals().add( mojoConfig.getChild( "goal" ).getValue() );
                     }
                 }
                 finally
@@ -150,14 +150,14 @@ public class MavenPluginArtifactInfoIndexCreator
 
     public void updateDocument( ArtifactInfo ai, Document doc )
     {
-        if ( ai.prefix != null )
+        if ( ai.getPrefix() != null )
         {
-            doc.add( FLD_PLUGIN_PREFIX.toField( ai.prefix ) );
+            doc.add( FLD_PLUGIN_PREFIX.toField( ai.getPrefix() ) );
         }
 
-        if ( ai.goals != null )
+        if ( ai.getGoals() != null )
         {
-            doc.add( FLD_PLUGIN_GOALS.toField( ArtifactInfo.lst2str( ai.goals ) ) );
+            doc.add( FLD_PLUGIN_GOALS.toField( ArtifactInfo.lst2str( ai.getGoals() ) ) );
         }
     }
 
@@ -165,15 +165,15 @@ public class MavenPluginArtifactInfoIndexCreator
     {
         boolean res = false;
 
-        if ( "maven-plugin".equals( ai.packaging ) )
+        if ( "maven-plugin".equals( ai.getPackaging() ) )
         {
-            ai.prefix = doc.get( ArtifactInfo.PLUGIN_PREFIX );
+            ai.setPrefix( doc.get( ArtifactInfo.PLUGIN_PREFIX ) );
 
             String goals = doc.get( ArtifactInfo.PLUGIN_GOALS );
 
             if ( goals != null )
             {
-                ai.goals = ArtifactInfo.str2lst( goals );
+                ai.setGoals( ArtifactInfo.str2lst( goals ) );
             }
 
             res = true;

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java
index b9f4837..f8543d3 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java
@@ -28,13 +28,8 @@ import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
-import org.apache.maven.index.ArtifactAvailablility;
-import org.apache.maven.index.ArtifactContext;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.IndexerField;
-import org.apache.maven.index.IndexerFieldVersion;
-import org.apache.maven.index.MAVEN;
-import org.apache.maven.index.NEXUS;
+import org.apache.maven.index.*;
+import org.apache.maven.index.ArtifactAvailability;
 import org.apache.maven.index.artifact.Gav;
 import org.apache.maven.index.context.IndexCreator;
 import org.apache.maven.index.locator.JavadocLocator;
@@ -127,40 +122,40 @@ public class MinimalArtifactInfoIndexCreator
 
         if ( pom != null )
         {
-            ai.lastModified = pom.lastModified();
+            ai.setLastModified( pom.lastModified() );
 
-            ai.fextension = "pom";
+            ai.setFileExtension( "pom" );
         }
 
         // TODO handle artifacts without poms
         if ( pom != null )
         {
-            if ( ai.classifier != null )
+            if ( ai.getClassifier() != null )
             {
-                ai.sourcesExists = ArtifactAvailablility.NOT_AVAILABLE;
+                ai.setSourcesExists( ArtifactAvailability.NOT_AVAILABLE );
 
-                ai.javadocExists = ArtifactAvailablility.NOT_AVAILABLE;
+                ai.setJavadocExists( ArtifactAvailability.NOT_AVAILABLE );
             }
             else
             {
                 File sources = sl.locate( pom );
                 if ( !sources.exists() )
                 {
-                    ai.sourcesExists = ArtifactAvailablility.NOT_PRESENT;
+                    ai.setSourcesExists( ArtifactAvailability.NOT_PRESENT );
                 }
                 else
                 {
-                    ai.sourcesExists = ArtifactAvailablility.PRESENT;
+                    ai.setSourcesExists( ArtifactAvailability.PRESENT );
                 }
 
                 File javadoc = jl.locate( pom );
                 if ( !javadoc.exists() )
                 {
-                    ai.javadocExists = ArtifactAvailablility.NOT_PRESENT;
+                    ai.setJavadocExists( ArtifactAvailability.NOT_PRESENT );
                 }
                 else
                 {
-                    ai.javadocExists = ArtifactAvailablility.PRESENT;
+                    ai.setJavadocExists( ArtifactAvailability.PRESENT );
                 }
             }
         }
@@ -169,18 +164,18 @@ public class MinimalArtifactInfoIndexCreator
 
         if ( model != null )
         {
-            ai.name = model.getName();
+            ai.setName( model.getName() );
 
-            ai.description = model.getDescription();
+            ai.setDescription( model.getDescription() );
 
             // for main artifacts (without classifier) only:
-            if ( ai.classifier == null )
+            if ( ai.getClassifier() == null )
             {
                 // only when this is not a classified artifact
                 if ( model.getPackaging() != null )
                 {
                     // set the read value that is coming from POM
-                    ai.packaging = model.getPackaging();
+                    ai.setPackaging( model.getPackaging() );
                 }
                 else
                 {
@@ -191,7 +186,7 @@ public class MinimalArtifactInfoIndexCreator
             }
         }
 
-        if ( "pom".equals( ai.packaging ) )
+        if ( "pom".equals( ai.getPackaging() ) )
         {
             // special case, the POM _is_ the artifact
             artifact = pom;
@@ -201,7 +196,7 @@ public class MinimalArtifactInfoIndexCreator
         {
             File signature = sigl.locate( artifact );
 
-            ai.signatureExists = signature.exists() ? ArtifactAvailablility.PRESENT : ArtifactAvailablility.NOT_PRESENT;
+            ai.setSignatureExists( signature.exists() ? ArtifactAvailability.PRESENT : ArtifactAvailability.NOT_PRESENT );
 
             File sha1 = sha1l.locate( artifact );
 
@@ -209,7 +204,7 @@ public class MinimalArtifactInfoIndexCreator
             {
                 try
                 {
-                    ai.sha1 = StringUtils.chomp( FileUtils.fileRead( sha1 ) ).trim().split( " " )[0];
+                    ai.setSha1( StringUtils.chomp( FileUtils.fileRead( sha1 ) ).trim().split( " " )[0] );
                 }
                 catch ( IOException e )
                 {
@@ -217,15 +212,15 @@ public class MinimalArtifactInfoIndexCreator
                 }
             }
 
-            ai.lastModified = artifact.lastModified();
+            ai.setLastModified( artifact.lastModified() );
 
-            ai.size = artifact.length();
+            ai.setSize( artifact.length() );
 
-            ai.fextension = getExtension( artifact, ac.getGav() );
+            ai.setFileExtension( getExtension( artifact, ac.getGav() ) );
 
-            if ( ai.packaging == null )
+            if ( ai.getPackaging() == null )
             {
-                ai.packaging = ai.fextension;
+                ai.setPackaging( ai.getFileExtension() );
             }
         }
     }
@@ -257,46 +252,46 @@ public class MinimalArtifactInfoIndexCreator
     public void updateDocument( ArtifactInfo ai, Document doc )
     {
         String info =
-            new StringBuilder().append( ai.packaging ).append( ArtifactInfo.FS ).append(
-                Long.toString( ai.lastModified ) ).append( ArtifactInfo.FS ).append( Long.toString( ai.size ) ).append(
-                ArtifactInfo.FS ).append( ai.sourcesExists.toString() ).append( ArtifactInfo.FS ).append(
-                ai.javadocExists.toString() ).append( ArtifactInfo.FS ).append( ai.signatureExists.toString() ).append(
-                ArtifactInfo.FS ).append( ai.fextension ).toString();
+            new StringBuilder().append( ai.getPackaging() ).append( ArtifactInfo.FS ).append(
+                Long.toString( ai.getLastModified() ) ).append( ArtifactInfo.FS ).append( Long.toString( ai.getSize() ) ).append(
+                ArtifactInfo.FS ).append( ai.getSourcesExists().toString() ).append( ArtifactInfo.FS ).append(
+                ai.getJavadocExists().toString() ).append( ArtifactInfo.FS ).append( ai.getSignatureExists().toString() ).append(
+                ArtifactInfo.FS ).append( ai.getFileExtension() ).toString();
 
         doc.add( FLD_INFO.toField( info ) );
 
-        doc.add( FLD_GROUP_ID_KW.toField( ai.groupId ) );
-        doc.add( FLD_ARTIFACT_ID_KW.toField( ai.artifactId ) );
-        doc.add( FLD_VERSION_KW.toField( ai.version ) );
+        doc.add( FLD_GROUP_ID_KW.toField( ai.getGroupId() ) );
+        doc.add( FLD_ARTIFACT_ID_KW.toField( ai.getArtifactId() ) );
+        doc.add( FLD_VERSION_KW.toField( ai.getVersion() ) );
 
         // V3
-        doc.add( FLD_GROUP_ID.toField( ai.groupId ) );
-        doc.add( FLD_ARTIFACT_ID.toField( ai.artifactId ) );
-        doc.add( FLD_VERSION.toField( ai.version ) );
+        doc.add( FLD_GROUP_ID.toField( ai.getGroupId() ) );
+        doc.add( FLD_ARTIFACT_ID.toField( ai.getArtifactId() ) );
+        doc.add( FLD_VERSION.toField( ai.getVersion() ) );
 
-        if ( ai.name != null )
+        if ( ai.getName() != null )
         {
-            doc.add( FLD_NAME.toField( ai.name ) );
+            doc.add( FLD_NAME.toField( ai.getName() ) );
         }
 
-        if ( ai.description != null )
+        if ( ai.getDescription() != null )
         {
-            doc.add( FLD_DESCRIPTION.toField( ai.description ) );
+            doc.add( FLD_DESCRIPTION.toField( ai.getDescription() ) );
         }
 
-        if ( ai.packaging != null )
+        if ( ai.getPackaging() != null )
         {
-            doc.add( FLD_PACKAGING.toField( ai.packaging ) );
+            doc.add( FLD_PACKAGING.toField( ai.getPackaging() ) );
         }
 
-        if ( ai.classifier != null )
+        if ( ai.getClassifier() != null )
         {
-            doc.add( FLD_CLASSIFIER.toField( ai.classifier ) );
+            doc.add( FLD_CLASSIFIER.toField( ai.getClassifier() ) );
         }
 
-        if ( ai.sha1 != null )
+        if ( ai.getSha1() != null )
         {
-            doc.add( FLD_SHA1.toField( ai.sha1 ) );
+            doc.add( FLD_SHA1.toField( ai.getSha1() ) );
         }
     }
 
@@ -305,19 +300,19 @@ public class MinimalArtifactInfoIndexCreator
         updateDocument( ai, doc );
 
         // legacy!
-        if ( ai.prefix != null )
+        if ( ai.getPrefix() != null )
         {
-            doc.add( new Field( ArtifactInfo.PLUGIN_PREFIX, ai.prefix, Field.Store.YES, Field.Index.NOT_ANALYZED ) );
+            doc.add( new Field( ArtifactInfo.PLUGIN_PREFIX, ai.getPrefix(), Field.Store.YES, Field.Index.NOT_ANALYZED ) );
         }
 
-        if ( ai.goals != null )
+        if ( ai.getGoals() != null )
         {
-            doc.add( new Field( ArtifactInfo.PLUGIN_GOALS, ArtifactInfo.lst2str( ai.goals ), Field.Store.YES,
+            doc.add( new Field( ArtifactInfo.PLUGIN_GOALS, ArtifactInfo.lst2str( ai.getGoals() ), Field.Store.YES,
                 Field.Index.NO ) );
         }
 
         doc.removeField( ArtifactInfo.GROUP_ID );
-        doc.add( new Field( ArtifactInfo.GROUP_ID, ai.groupId, Field.Store.NO, Field.Index.NOT_ANALYZED ) );
+        doc.add( new Field( ArtifactInfo.GROUP_ID, ai.getGroupId(), Field.Store.NO, Field.Index.NOT_ANALYZED ) );
     }
 
     public boolean updateArtifactInfo( Document doc, ArtifactInfo ai )
@@ -330,15 +325,15 @@ public class MinimalArtifactInfoIndexCreator
         {
             String[] r = ArtifactInfo.FS_PATTERN.split( uinfo );
 
-            ai.groupId = r[0];
+            ai.setGroupId( r[0] );
 
-            ai.artifactId = r[1];
+            ai.setArtifactId( r[1] );
 
-            ai.version = r[2];
+            ai.setVersion( r[2] );
 
             if ( r.length > 3 )
             {
-                ai.classifier = ArtifactInfo.renvl( r[3] );
+                ai.setClassifier( ArtifactInfo.renvl( r[3] ) );
             }
 
             res = true;
@@ -350,34 +345,34 @@ public class MinimalArtifactInfoIndexCreator
         {
             String[] r = ArtifactInfo.FS_PATTERN.split( info );
 
-            ai.packaging = r[0];
+            ai.setPackaging( r[0] );
 
-            ai.lastModified = Long.parseLong( r[1] );
+            ai.setLastModified( Long.parseLong( r[1] ) );
 
-            ai.size = Long.parseLong( r[2] );
+            ai.setSize( Long.parseLong( r[2] ) );
 
-            ai.sourcesExists = ArtifactAvailablility.fromString( r[3] );
+            ai.setSourcesExists( ArtifactAvailability.fromString( r[ 3 ] ) );
 
-            ai.javadocExists = ArtifactAvailablility.fromString( r[4] );
+            ai.setJavadocExists( ArtifactAvailability.fromString( r[ 4 ] ) );
 
-            ai.signatureExists = ArtifactAvailablility.fromString( r[5] );
+            ai.setSignatureExists( ArtifactAvailability.fromString( r[ 5 ] ) );
 
             if ( r.length > 6 )
             {
-                ai.fextension = r[6];
+                ai.setFileExtension( r[6] );
             }
             else
             {
-                if ( ai.classifier != null //
-                    || "pom".equals( ai.packaging ) //
-                    || "war".equals( ai.packaging ) //
-                    || "ear".equals( ai.packaging ) )
+                if ( ai.getClassifier() != null //
+                    || "pom".equals( ai.getPackaging() ) //
+                    || "war".equals( ai.getPackaging() ) //
+                    || "ear".equals( ai.getPackaging() ) )
                 {
-                    ai.fextension = ai.packaging;
+                    ai.setFileExtension( ai.getPackaging() );
                 }
                 else
                 {
-                    ai.fextension = "jar"; // best guess
+                    ai.setFileExtension( "jar" ); // best guess
                 }
             }
 
@@ -388,7 +383,7 @@ public class MinimalArtifactInfoIndexCreator
 
         if ( name != null )
         {
-            ai.name = name;
+            ai.setName( name );
 
             res = true;
         }
@@ -397,23 +392,23 @@ public class MinimalArtifactInfoIndexCreator
 
         if ( description != null )
         {
-            ai.description = description;
+            ai.setDescription( description );
 
             res = true;
         }
 
         // sometimes there's a pom without packaging(default to jar), but no artifact, then the value will be a "null"
         // String
-        if ( "null".equals( ai.packaging ) )
+        if ( "null".equals( ai.getPackaging() ) )
         {
-            ai.packaging = null;
+            ai.setPackaging( null );
         }
 
         String sha1 = doc.get( ArtifactInfo.SHA1 );
 
         if ( sha1 != null )
         {
-            ai.sha1 = sha1;
+            ai.setSha1( sha1 );
         }
 
         return res;

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
index 41c1451..730797e 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
@@ -161,54 +161,54 @@ public class OsgiArtifactIndexCreator
     public void updateDocument( ArtifactInfo artifactInfo, Document document )
     {
 
-        if ( artifactInfo.bundleSymbolicName != null )
+        if ( artifactInfo.getBundleSymbolicName() != null )
         {
-            document.add( FLD_BUNDLE_SYMBOLIC_NAME.toField( artifactInfo.bundleSymbolicName ) );
+            document.add( FLD_BUNDLE_SYMBOLIC_NAME.toField( artifactInfo.getBundleSymbolicName() ) );
         }
 
-        if ( artifactInfo.bundleVersion != null )
+        if ( artifactInfo.getBundleVersion() != null )
         {
-            document.add( FLD_BUNDLE_VERSION.toField( artifactInfo.bundleVersion ) );
+            document.add( FLD_BUNDLE_VERSION.toField( artifactInfo.getBundleVersion() ) );
         }
 
-        if ( artifactInfo.bundleExportPackage != null )
+        if ( artifactInfo.getBundleExportPackage() != null )
         {
-            document.add( FLD_BUNDLE_EXPORT_PACKAGE.toField( artifactInfo.bundleExportPackage ) );
+            document.add( FLD_BUNDLE_EXPORT_PACKAGE.toField( artifactInfo.getBundleExportPackage() ) );
         }
 
-        if ( artifactInfo.bundleExportService != null )
+        if ( artifactInfo.getBundleExportService() != null )
         {
-            document.add( FLD_BUNDLE_EXPORT_SERVIVE.toField( artifactInfo.bundleExportService ) );
+            document.add( FLD_BUNDLE_EXPORT_SERVIVE.toField( artifactInfo.getBundleExportService() ) );
         }
 
-        if ( artifactInfo.bundleDescription != null )
+        if ( artifactInfo.getBundleDescription() != null )
         {
-            document.add( FLD_BUNDLE_DESCRIPTION.toField( artifactInfo.bundleDescription ) );
+            document.add( FLD_BUNDLE_DESCRIPTION.toField( artifactInfo.getBundleDescription() ) );
         }
 
-        if ( artifactInfo.bundleName != null )
+        if ( artifactInfo.getBundleName() != null )
         {
-            document.add( FLD_BUNDLE_NAME.toField( artifactInfo.bundleName ) );
+            document.add( FLD_BUNDLE_NAME.toField( artifactInfo.getBundleName() ) );
         }
 
-        if ( artifactInfo.bundleLicense != null )
+        if ( artifactInfo.getBundleLicense() != null )
         {
-            document.add( FLD_BUNDLE_LICENSE.toField( artifactInfo.bundleLicense ) );
+            document.add( FLD_BUNDLE_LICENSE.toField( artifactInfo.getBundleLicense() ) );
         }
 
-        if ( artifactInfo.bundleDocUrl != null )
+        if ( artifactInfo.getBundleDocUrl() != null )
         {
-            document.add( FLD_BUNDLE_DOCURL.toField( artifactInfo.bundleDocUrl ) );
+            document.add( FLD_BUNDLE_DOCURL.toField( artifactInfo.getBundleDocUrl() ) );
         }
 
-        if ( artifactInfo.bundleImportPackage != null )
+        if ( artifactInfo.getBundleImportPackage() != null )
         {
-            document.add( FLD_BUNDLE_IMPORT_PACKAGE.toField( artifactInfo.bundleImportPackage ) );
+            document.add( FLD_BUNDLE_IMPORT_PACKAGE.toField( artifactInfo.getBundleImportPackage() ) );
         }
 
-        if ( artifactInfo.bundleRequireBundle != null )
+        if ( artifactInfo.getBundleRequireBundle() != null )
         {
-            document.add( FLD_BUNDLE_REQUIRE_BUNDLE.toField( artifactInfo.bundleRequireBundle ) );
+            document.add( FLD_BUNDLE_REQUIRE_BUNDLE.toField( artifactInfo.getBundleRequireBundle() ) );
         }
     }
 
@@ -220,7 +220,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleSymbolicName != null )
         {
-            artifactInfo.bundleSymbolicName = bundleSymbolicName;
+            artifactInfo.setBundleSymbolicName( bundleSymbolicName );
 
             updated = true;
         }
@@ -229,7 +229,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleVersion != null )
         {
-            artifactInfo.bundleVersion = bundleVersion;
+            artifactInfo.setBundleVersion( bundleVersion );
 
             updated = true;
         }
@@ -238,7 +238,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleExportPackage != null )
         {
-            artifactInfo.bundleExportPackage = bundleExportPackage;
+            artifactInfo.setBundleExportPackage( bundleExportPackage );
 
             updated = true;
 
@@ -248,7 +248,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleExportService != null )
         {
-            artifactInfo.bundleExportService = bundleExportService;
+            artifactInfo.setBundleExportService( bundleExportService );
 
             updated = true;
 
@@ -258,7 +258,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleDescription != null )
         {
-            artifactInfo.bundleDescription = bundleDescription;
+            artifactInfo.setBundleDescription( bundleDescription );
 
             updated = true;
 
@@ -269,7 +269,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleName != null )
         {
-            artifactInfo.bundleName = bundleName;
+            artifactInfo.setBundleName( bundleName );
 
             updated = true;
 
@@ -280,7 +280,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleLicense != null )
         {
-            artifactInfo.bundleLicense = bundleLicense;
+            artifactInfo.setBundleLicense( bundleLicense );
 
             updated = true;
 
@@ -290,7 +290,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleDocUrl != null )
         {
-            artifactInfo.bundleDocUrl = bundleDocUrl;
+            artifactInfo.setBundleDocUrl( bundleDocUrl );
 
             updated = true;
 
@@ -300,7 +300,7 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleImportPackage != null )
         {
-            artifactInfo.bundleImportPackage = bundleImportPackage;
+            artifactInfo.setBundleImportPackage( bundleImportPackage );
 
             updated = true;
 
@@ -310,13 +310,12 @@ public class OsgiArtifactIndexCreator
 
         if ( bundleRequireBundle != null )
         {
-            artifactInfo.bundleRequireBundle = bundleRequireBundle;
+            artifactInfo.setBundleRequireBundle( bundleRequireBundle );
 
             updated = true;
 
         }
 
-
         return updated;
     }
 
@@ -346,111 +345,111 @@ public class OsgiArtifactIndexCreator
                         String attValue = mainAttributes.getValue( BSN );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleSymbolicName = attValue;
+                            ai.setBundleSymbolicName( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleSymbolicName = null;
+                            ai.setBundleSymbolicName( null );
                         }
 
                         attValue = mainAttributes.getValue( BV );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleVersion = attValue;
+                            ai.setBundleVersion( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleVersion = null;
+                            ai.setBundleVersion( null );
                         }
 
                         attValue = mainAttributes.getValue( BEP );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleExportPackage = attValue;
+                            ai.setBundleExportPackage( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleExportPackage = null;
+                            ai.setBundleExportPackage( null );
                         }
 
                         attValue = mainAttributes.getValue( BES );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleExportService = attValue;
+                            ai.setBundleExportService( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleExportService = null;
+                            ai.setBundleExportService( null );
                         }
 
                         attValue = mainAttributes.getValue( BD );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleDescription = attValue;
+                            ai.setBundleDescription( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleDescription = null;
+                            ai.setBundleDescription( null );
                         }
 
                         attValue = mainAttributes.getValue( BN );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleName = attValue;
+                            ai.setBundleName( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleName = null;
+                            ai.setBundleName( null );
                         }
 
                         attValue = mainAttributes.getValue( BL );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleLicense = attValue;
+                            ai.setBundleLicense( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleLicense = null;
+                            ai.setBundleLicense( null );
                         }
 
                         attValue = mainAttributes.getValue( BDU );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleDocUrl = attValue;
+                            ai.setBundleDocUrl( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleDocUrl = null;
+                            ai.setBundleDocUrl( null );
                         }
 
                         attValue = mainAttributes.getValue( BIP );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleImportPackage = attValue;
+                            ai.setBundleImportPackage( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleImportPackage = null;
+                            ai.setBundleImportPackage( null );
                         }
 
                         attValue = mainAttributes.getValue( BRB );
                         if ( StringUtils.isNotBlank( attValue ) )
                         {
-                            ai.bundleRequireBundle = attValue;
+                            ai.setBundleRequireBundle( attValue );
                             updated = true;
                         }
                         else
                         {
-                            ai.bundleRequireBundle = null;
+                            ai.setBundleRequireBundle( null );
                         }
 
                     }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAGrouping.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAGrouping.java b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAGrouping.java
index 761b37b..0f7af72 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAGrouping.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAGrouping.java
@@ -46,7 +46,7 @@ public class GAGrouping
     @Override
     protected String getGroupKey( ArtifactInfo artifactInfo )
     {
-        return artifactInfo.groupId + " : " + artifactInfo.artifactId;
+        return artifactInfo.getGroupId() + " : " + artifactInfo.getArtifactId();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAVGrouping.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAVGrouping.java b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAVGrouping.java
index b73378e..28f1d57 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAVGrouping.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GAVGrouping.java
@@ -46,8 +46,8 @@ public class GAVGrouping
     @Override
     protected String getGroupKey( ArtifactInfo artifactInfo )
     {
-        return artifactInfo.groupId + ":" + artifactInfo.artifactId + ":" + artifactInfo.version + ":"
-            + artifactInfo.classifier;
+        return artifactInfo.getGroupId() + ":" + artifactInfo.getArtifactId() + ":" + artifactInfo.getVersion() + ":"
+            + artifactInfo.getClassifier();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GGrouping.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GGrouping.java b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GGrouping.java
index 9d79171..4b11fde 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GGrouping.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/GGrouping.java
@@ -46,7 +46,7 @@ public class GGrouping
     @Override
     protected String getGroupKey( ArtifactInfo artifactInfo )
     {
-        return artifactInfo.groupId;
+        return artifactInfo.getGroupId();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGAVGrouping.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGAVGrouping.java b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGAVGrouping.java
index 6bb63e6..76e3163 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGAVGrouping.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGAVGrouping.java
@@ -46,8 +46,8 @@ public class RGAVGrouping
     @Override
     protected String getGroupKey( ArtifactInfo artifactInfo )
     {
-        return artifactInfo.repository + ":" + artifactInfo.groupId + ":" + artifactInfo.artifactId + ":"
-            + artifactInfo.version + ":" + artifactInfo.classifier;
+        return artifactInfo.getRepository() + ":" + artifactInfo.getGroupId() + ":" + artifactInfo.getArtifactId() + ":"
+            + artifactInfo.getVersion() + ":" + artifactInfo.getClassifier();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGGrouping.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGGrouping.java b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGGrouping.java
index 9e91433..f98e869 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGGrouping.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/search/grouping/RGGrouping.java
@@ -46,7 +46,7 @@ public class RGGrouping
     @Override
     protected String getGroupKey( ArtifactInfo artifactInfo )
     {
-        return artifactInfo.repository + ":" + artifactInfo.groupId;
+        return artifactInfo.getRepository() + ":" + artifactInfo.getGroupId();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java
index 87552c9..805d762 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java
@@ -123,7 +123,7 @@ public class DefaultIndexTreeView
 
     /**
      * @param root
-     * @param factory
+     * @param request
      * @param allGroups
      * @throws IOException
      */
@@ -144,13 +144,13 @@ public class DefaultIndexTreeView
         {
             for ( ArtifactInfo ai : artifacts )
             {
-                String versionKey = Type.V + ":" + ai.artifactId + ":" + ai.version;
+                String versionKey = Type.V + ":" + ai.getArtifactId() + ":" + ai.getVersion();
 
                 TreeNode versionResource = folders.get( versionKey );
 
                 if ( versionResource == null )
                 {
-                    String artifactKey = Type.A + ":" + ai.artifactId;
+                    String artifactKey = Type.A + ":" + ai.getArtifactId();
 
                     TreeNode artifactResource = folders.get( artifactKey );
 
@@ -163,7 +163,7 @@ public class DefaultIndexTreeView
                         // here comes the twist: we have to search for parent G node
                         String partialGroupId = null;
 
-                        String[] groupIdElems = ai.groupId.split( "\\." );
+                        String[] groupIdElems = ai.getGroupId().split( "\\." );
 
                         for ( String groupIdElem : groupIdElems )
                         {
@@ -275,7 +275,7 @@ public class DefaultIndexTreeView
     {
         StringBuilder sb = new StringBuilder( "/" );
 
-        sb.append( ai.groupId.replaceAll( "\\.", "/" ) );
+        sb.append( ai.getGroupId().replaceAll( "\\.", "/" ) );
 
         if ( MAVEN.GROUP_ID.equals( field ) )
         {
@@ -283,7 +283,7 @@ public class DefaultIndexTreeView
             return sb.append( "/" ).toString();
         }
 
-        sb.append( "/" ).append( ai.artifactId );
+        sb.append( "/" ).append( ai.getArtifactId() );
 
         if ( MAVEN.ARTIFACT_ID.equals( field ) )
         {
@@ -291,7 +291,7 @@ public class DefaultIndexTreeView
             return sb.append( "/" ).toString();
         }
 
-        sb.append( "/" ).append( ai.version );
+        sb.append( "/" ).append( ai.getVersion() );
 
         if ( MAVEN.VERSION.equals( field ) )
         {
@@ -299,14 +299,14 @@ public class DefaultIndexTreeView
             return sb.append( "/" ).toString();
         }
 
-        sb.append( "/" ).append( ai.artifactId ).append( "-" ).append( ai.version );
+        sb.append( "/" ).append( ai.getArtifactId() ).append( "-" ).append( ai.getVersion() );
 
-        if ( ai.classifier != null )
+        if ( ai.getClassifier() != null )
         {
-            sb.append( "-" ).append( ai.classifier );
+            sb.append( "-" ).append( ai.getClassifier() );
         }
 
-        sb.append( "." ).append( ai.fextension == null ? "jar" : ai.fextension );
+        sb.append( "." ).append( ai.getFileExtension() == null ? "jar" : ai.getFileExtension() );
 
         return sb.toString();
     }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultTreeNodeFactory.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultTreeNodeFactory.java b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultTreeNodeFactory.java
index cfa9b5f..bd708d7 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultTreeNodeFactory.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultTreeNodeFactory.java
@@ -57,11 +57,11 @@ public class DefaultTreeNodeFactory
 
     public TreeNode createANode( IndexTreeView tview, TreeViewRequest req, ArtifactInfo ai, String path )
     {
-        TreeNode result = createNode( tview, req, path, false, ai.artifactId, Type.A );
+        TreeNode result = createNode( tview, req, path, false, ai.getArtifactId(), Type.A );
 
-        result.setGroupId( ai.groupId );
+        result.setGroupId( ai.getGroupId() );
 
-        result.setArtifactId( ai.artifactId );
+        result.setArtifactId( ai.getArtifactId() );
 
         return decorateANode( tview, req, ai, path, result );
     }
@@ -74,13 +74,13 @@ public class DefaultTreeNodeFactory
 
     public TreeNode createVNode( IndexTreeView tview, TreeViewRequest req, ArtifactInfo ai, String path )
     {
-        TreeNode result = createNode( tview, req, path, false, ai.version, Type.V );
+        TreeNode result = createNode( tview, req, path, false, ai.getVersion(), Type.V );
 
-        result.setGroupId( ai.groupId );
+        result.setGroupId( ai.getGroupId() );
 
-        result.setArtifactId( ai.artifactId );
+        result.setArtifactId( ai.getArtifactId() );
 
-        result.setVersion( ai.version );
+        result.setVersion( ai.getVersion() );
 
         return decorateVNode( tview, req, ai, path, result );
     }
@@ -93,22 +93,22 @@ public class DefaultTreeNodeFactory
 
     public TreeNode createArtifactNode( IndexTreeView tview, TreeViewRequest req, ArtifactInfo ai, String path )
     {
-        StringBuilder sb = new StringBuilder( ai.artifactId ).append( "-" ).append( ai.version );
+        StringBuilder sb = new StringBuilder( ai.getArtifactId() ).append( "-" ).append( ai.getVersion() );
 
-        if ( ai.classifier != null )
+        if ( ai.getClassifier() != null )
         {
-            sb.append( "-" ).append( ai.classifier );
+            sb.append( "-" ).append( ai.getClassifier() );
         }
 
-        sb.append( "." ).append( ai.fextension == null ? "jar" : ai.fextension );
+        sb.append( "." ).append( ai.getFileExtension() == null ? "jar" : ai.getFileExtension() );
 
         TreeNode result = createNode( tview, req, path, true, sb.toString(), Type.artifact );
 
-        result.setGroupId( ai.groupId );
+        result.setGroupId( ai.getGroupId() );
 
-        result.setArtifactId( ai.artifactId );
+        result.setArtifactId( ai.getArtifactId() );
 
-        result.setVersion( ai.version );
+        result.setVersion( ai.getVersion() );
 
         return decorateArtifactNode( tview, req, ai, path, result );
     }

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
index b78a82a..05693c3 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
@@ -109,12 +109,12 @@ public abstract class AbstractRepoNexusIndexerTest
 
         {
             ArtifactInfo ai = list.get( 0 );
-            assertEquals( "1.6.1", ai.version );
+            assertEquals( "1.6.1", ai.getVersion() );
         }
         {
             ArtifactInfo ai = list.get( 1 );
-            assertEquals( "1.5", ai.version );
-            assertEquals( "test", ai.repository );
+            assertEquals( "1.5", ai.getVersion() );
+            assertEquals( "test", ai.getRepository() );
         }
     }
 
@@ -144,13 +144,13 @@ public abstract class AbstractRepoNexusIndexerTest
 
         ArtifactInfo ai = list.get( 0 );
 
-        assertEquals( "1.6.1", ai.version );
+        assertEquals( "1.6.1", ai.getVersion() );
 
         ai = list.get( 1 );
 
-        assertEquals( "1.5", ai.version );
+        assertEquals( "1.5", ai.getVersion() );
 
-        assertEquals( "test", ai.repository );
+        assertEquals( "test", ai.getRepository() );
     }
 
     public void testSearchGroupedProblematicNames()
@@ -401,11 +401,11 @@ public abstract class AbstractRepoNexusIndexerTest
         
         assertNotNull( ai );
 
-        assertEquals( "qdox", ai.groupId );
+        assertEquals( "qdox", ai.getGroupId() );
 
-        assertEquals( "qdox", ai.artifactId );
+        assertEquals( "qdox", ai.getArtifactId() );
 
-        assertEquals( "1.5", ai.version );
+        assertEquals( "1.5", ai.getVersion() );
 
         // Using a file
 
@@ -419,11 +419,11 @@ public abstract class AbstractRepoNexusIndexerTest
 
         assertNotNull( "Can't identify qdox-1.5.jar", ai );
 
-        assertEquals( "qdox", ai.groupId );
+        assertEquals( "qdox", ai.getGroupId() );
 
-        assertEquals( "qdox", ai.artifactId );
+        assertEquals( "qdox", ai.getArtifactId() );
 
-        assertEquals( "1.5", ai.version );
+        assertEquals( "1.5", ai.getVersion() );
     }
 
     // Paging is currently disabled
@@ -548,8 +548,8 @@ public abstract class AbstractRepoNexusIndexerTest
             assertEquals( response.getResults().toString(), 1, response.getTotalHits() );
 
             ArtifactInfo ai = response.getResults().iterator().next();
-            assertEquals( "tar.gz", ai.packaging );
-            assertEquals( "tar.gz", ai.fextension );
+            assertEquals( "tar.gz", ai.getPackaging() );
+            assertEquals( "tar.gz", ai.getFileExtension() );
         }
         {
             Query query = nexusIndexer.constructQuery( MAVEN.PACKAGING, "zip", SearchType.EXACT );
@@ -557,8 +557,8 @@ public abstract class AbstractRepoNexusIndexerTest
             assertEquals( response.getResults().toString(), 1, response.getTotalHits() );
 
             ArtifactInfo ai = response.getResults().iterator().next();
-            assertEquals( "zip", ai.packaging );
-            assertEquals( "zip", ai.fextension );
+            assertEquals( "zip", ai.getPackaging() );
+            assertEquals( "zip", ai.getFileExtension() );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
index 0dfbe16..af70b34 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
@@ -99,7 +99,7 @@ public class ConcurrentUseTest
 
         //
 
-        Query q = nexusIndexer.constructQuery( MAVEN.GROUP_ID, new UserInputSearchExpression( ai.groupId ) );
+        Query q = nexusIndexer.constructQuery( MAVEN.GROUP_ID, new UserInputSearchExpression( ai.getGroupId() ) );
 
         FlatSearchResponse result = nexusIndexer.searchFlat( new FlatSearchRequest( q, context ) );
 

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
index f344b71..83bf1e4 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
@@ -86,11 +86,11 @@ public class DefaultIndexNexusIndexerTest
 
         ArtifactInfo ai = r.iterator().next();
 
-        assertEquals( "org.apache.maven.plugins", ai.groupId );
-        assertEquals( "maven-core-it-plugin", ai.artifactId );
-        assertEquals( "core-it", ai.prefix );
+        assertEquals( "org.apache.maven.plugins", ai.getGroupId() );
+        assertEquals( "maven-core-it-plugin", ai.getArtifactId() );
+        assertEquals( "core-it", ai.getPrefix() );
 
-        List<String> goals = ai.goals;
+        List<String> goals = ai.getGoals();
         assertEquals( 14, goals.size() );
         assertEquals( "catch", goals.get( 0 ) );
         assertEquals( "fork", goals.get( 1 ) );
@@ -135,27 +135,27 @@ public class DefaultIndexNexusIndexerTest
         Iterator<ArtifactInfo> it = r.iterator();
         {
             ArtifactInfo ai = it.next();
-            assertEquals( "org.apache.directory.server", ai.groupId );
-            assertEquals( "apacheds-schema-archetype", ai.artifactId );
-            assertEquals( "1.0.2", ai.version );
+            assertEquals( "org.apache.directory.server", ai.getGroupId() );
+            assertEquals( "apacheds-schema-archetype", ai.getArtifactId() );
+            assertEquals( "1.0.2", ai.getVersion() );
         }
         {
             ArtifactInfo ai = it.next();
-            assertEquals( "org.apache.servicemix.tooling", ai.groupId );
-            assertEquals( "servicemix-service-engine", ai.artifactId );
-            assertEquals( "3.1", ai.version );
+            assertEquals( "org.apache.servicemix.tooling", ai.getGroupId() );
+            assertEquals( "servicemix-service-engine", ai.getArtifactId() );
+            assertEquals( "3.1", ai.getVersion() );
         }
         {
             ArtifactInfo ai = it.next();
-            assertEquals( "org.terracotta.maven.archetypes", ai.groupId );
-            assertEquals( "pojo-archetype", ai.artifactId );
-            assertEquals( "1.0.3", ai.version );
+            assertEquals( "org.terracotta.maven.archetypes", ai.getGroupId() );
+            assertEquals( "pojo-archetype", ai.getArtifactId() );
+            assertEquals( "1.0.3", ai.getVersion() );
         }
         {
             ArtifactInfo ai = it.next();
-            assertEquals( "proptest", ai.groupId );
-            assertEquals( "proptest-archetype", ai.artifactId );
-            assertEquals( "1.0", ai.version );
+            assertEquals( "proptest", ai.getGroupId() );
+            assertEquals( "proptest-archetype", ai.getArtifactId() );
+            assertEquals( "1.0", ai.getVersion() );
         }
     }
 
@@ -197,13 +197,13 @@ public class DefaultIndexNexusIndexerTest
 
         ArtifactInfo ai = list.get( 0 );
 
-        assertEquals( "1.6.1", ai.version );
+        assertEquals( "1.6.1", ai.getVersion() );
 
         ai = list.get( 1 );
 
-        assertEquals( "1.5", ai.version );
+        assertEquals( "1.5", ai.getVersion() );
 
-        assertEquals( "test", ai.repository );
+        assertEquals( "test", ai.getRepository() );
 
         Date timestamp = newContext.getTimestamp();
 
@@ -262,10 +262,10 @@ public class DefaultIndexNexusIndexerTest
 
         ArtifactInfo ai = r.iterator().next();
 
-        assertEquals( "brokenjar", ai.groupId );
-        assertEquals( "brokenjar", ai.artifactId );
-        assertEquals( "1.0", ai.version );
-        assertEquals( null, ai.classNames );
+        assertEquals( "brokenjar", ai.getGroupId() );
+        assertEquals( "brokenjar", ai.getArtifactId() );
+        assertEquals( "1.0", ai.getVersion() );
+        assertEquals( null, ai.getClassNames() );
     }
 
     public void testMissingPom()
@@ -283,11 +283,11 @@ public class DefaultIndexNexusIndexerTest
 
         ArtifactInfo ai = r.iterator().next();
 
-        assertEquals( "missingpom", ai.groupId );
-        assertEquals( "missingpom", ai.artifactId );
-        assertEquals( "1.0", ai.version );
+        assertEquals( "missingpom", ai.getGroupId() );
+        assertEquals( "missingpom", ai.getArtifactId() );
+        assertEquals( "1.0", ai.getVersion() );
         // See Nexus 2318. It should be null for a jar without classes
-        assertNull( ai.classNames );
+        assertNull( ai.getClassNames() );
     }
 
 }


Mime
View raw message