Improve codestyle

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-repositories/xwiki-platform-extension-repository-xwiki/xwiki-platform-extension-repository-xwiki-server-api/src/main/java/org/xwiki/extension/repository/xwiki/internal/resources/AbstractExtensionRESTResource.java

@@ -125,14 +125,14 @@ public abstract class AbstractExtensionRESTResource extends XWikiResource implem
     /**
      * The object factory for model objects to be used when creating representations.
      */
-    protected ObjectFactory objectFactory;
+    protected ObjectFactory extensionObjectFactory;
 
     @Override
     public void initialize() throws InitializationException
     {
         super.initialize();
 
-        this.objectFactory = new ObjectFactory();
+        this.extensionObjectFactory = new ObjectFactory();
     }
 
     public XWikiDocument getExistingExtensionDocumentById(String extensionId) throws QueryException, XWikiException
@@ -254,12 +254,12 @@ protected BaseObject getExtensionObject(String extensionId) throws XWikiExceptio
     protected BaseObject getExtensionVersionObject(XWikiDocument extensionDocument, String version)
     {
         if (version == null) {
-            Vector<BaseObject> objects = extensionDocument.getObjects(XWikiRepositoryModel.EXTENSIONVERSION_CLASSNAME);
+            List<BaseObject> objects = extensionDocument.getXObjects(XWikiRepositoryModel.EXTENSIONVERSION_CLASSREFERENCE);
 
-            if (objects.isEmpty()) {
+            if (objects == null || objects.isEmpty()) {
                 return null;
             } else {
-                return objects.lastElement();
+                return objects.get(objects.size() - 1);
             }
         }
 
@@ -283,7 +283,7 @@ protected <E extends AbstractExtension> E createExtension(XWikiDocument extensio
         AbstractExtension extension;
         ExtensionVersion extensionVersion;
         if (version == null) {
-            extension = this.objectFactory.createExtension();
+            extension = this.extensionObjectFactory.createExtension();
             extensionVersion = null;
         } else {
             BaseObject extensionVersionObject = getExtensionVersionObject(extensionDocument, version);
@@ -292,7 +292,7 @@ protected <E extends AbstractExtension> E createExtension(XWikiDocument extensio
                 throw new WebApplicationException(Status.NOT_FOUND);
             }
 
-            extension = extensionVersion = this.objectFactory.createExtensionVersion();
+            extension = extensionVersion = this.extensionObjectFactory.createExtensionVersion();
             extensionVersion.setVersion((String) getValue(extensionVersionObject,
                 XWikiRepositoryModel.PROP_VERSION_VERSION));
         }
@@ -300,7 +300,7 @@ protected <E extends AbstractExtension> E createExtension(XWikiDocument extensio
         extension.setId((String) getValue(extensionObject, XWikiRepositoryModel.PROP_EXTENSION_ID));
         extension.setType((String) getValue(extensionObject, XWikiRepositoryModel.PROP_EXTENSION_TYPE));
 
-        License license = this.objectFactory.createLicense();
+        License license = this.extensionObjectFactory.createLicense();
         license.setName((String) getValue(extensionObject, XWikiRepositoryModel.PROP_EXTENSION_LICENSENAME));
         extension.getLicenses().add(license);
 
@@ -330,7 +330,7 @@ protected <E extends AbstractExtension> E createExtension(XWikiDocument extensio
                         if (StringUtils.equals(
                             getValue(dependencyObject, XWikiRepositoryModel.PROP_DEPENDENCY_EXTENSIONVERSION,
                                 (String) null), version)) {
-                            ExtensionDependency dependency = objectFactory.createExtensionDependency();
+                            ExtensionDependency dependency = extensionObjectFactory.createExtensionDependency();
                             dependency.setId((String) getValue(dependencyObject,
                                 XWikiRepositoryModel.PROP_DEPENDENCY_ID));
                             dependency.setConstraint((String) getValue(dependencyObject,
@@ -385,7 +385,7 @@ private <T> T getQueryValue(Object[] entry, String property)
 
     private ExtensionVersion createExtensionVersionFromQueryResult(Object[] entry)
     {
-        ExtensionVersion extension = this.objectFactory.createExtensionVersion();
+        ExtensionVersion extension = this.extensionObjectFactory.createExtensionVersion();
 
         extension.setId(this.<String> getQueryValue(entry, XWikiRepositoryModel.PROP_EXTENSION_ID));
         extension.setType(this.<String> getQueryValue(entry, XWikiRepositoryModel.PROP_EXTENSION_TYPE));
@@ -413,7 +413,7 @@ this.<String> getQueryValue(entry, XWikiRepositoryModel.PROP_EXTENSION_AUTHORS),
                 this.<String> getQueryValue(entry, XWikiRepositoryModel.PROP_EXTENSION_FEATURES), "|", false));
 
         // License
-        License license = this.objectFactory.createLicense();
+        License license = this.extensionObjectFactory.createLicense();
         license.setName(this.<String> getQueryValue(entry, XWikiRepositoryModel.PROP_EXTENSION_LICENSENAME));
         extension.getLicenses().add(license);
 
@@ -442,10 +442,10 @@ private ExtensionSummary createExtensionSummaryFromQueryResult(Object[] entry)
         ExtensionVersionSummary extensionVersion;
         if (entry.length == EPROPERTIES_SUMMARY.length) {
             // It's a extension summary without version
-            extension = this.objectFactory.createExtensionSummary();
+            extension = this.extensionObjectFactory.createExtensionSummary();
             extensionVersion = null;
         } else {
-            extension = extensionVersion = this.objectFactory.createExtensionVersionSummary();
+            extension = extensionVersion = this.extensionObjectFactory.createExtensionVersionSummary();
             extensionVersion.setVersion((String) entry[EPROPERTIES_SUMMARY.length]);
         }
 

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-repositories/xwiki-platform-extension-repository-xwiki/xwiki-platform-extension-repository-xwiki-server-api/src/main/java/org/xwiki/extension/repository/xwiki/internal/resources/ExtensionVersionsRESTResource.java

@@ -63,7 +63,7 @@ public ExtensionVersions getExtensionVersions(@PathParam("extensionId") String e
 
         query.bindValue("extensionId", extensionId);
 
-        ExtensionVersions extensions = this.objectFactory.createExtensionVersions();
+        ExtensionVersions extensions = this.extensionObjectFactory.createExtensionVersions();
 
         getExtensionSummaries(extensions.getExtensionVersionSummaries(), query);
 

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-repositories/xwiki-platform-extension-repository-xwiki/xwiki-platform-extension-repository-xwiki-server-api/src/main/java/org/xwiki/extension/repository/xwiki/internal/resources/ExtensionsRESTResource.java

@@ -47,7 +47,7 @@ public Extensions getExtensions(@QueryParam(Resources.QPARAM_LIST_START) @Defaul
         @QueryParam(Resources.QPARAM_LIST_REQUIRETOTALHITS) @DefaultValue("true") boolean requireTotalHits)
         throws QueryException
     {
-        Extensions extensions = this.objectFactory.createExtensions();
+        Extensions extensions = this.extensionObjectFactory.createExtensions();
 
         if (requireTotalHits) {
             Query countQuery = createExtensionsCountQuery(null, null);

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-repositories/xwiki-platform-extension-repository-xwiki/xwiki-platform-extension-repository-xwiki-server-api/src/main/java/org/xwiki/extension/repository/xwiki/internal/resources/SearchRESTResource.java

@@ -54,7 +54,7 @@ public ExtensionsSearchResult search(@QueryParam(Resources.QPARAM_SEARCH_QUERY)
         @QueryParam(Resources.QPARAM_LIST_REQUIRETOTALHITS) @DefaultValue("true") boolean requireTotalHits)
         throws QueryException
     {
-        ExtensionsSearchResult result = this.objectFactory.createExtensionsSearchResult();
+        ExtensionsSearchResult result = this.extensionObjectFactory.createExtensionsSearchResult();
 
         result.setOffset(offset);