Rename OSGi classes for Java naming conventions (#9320)

- Rename OSGi to Osgi in class names.
- Rename VaadinOSGiPortlet to OSGiVaadinPortlet for consistency with
Spring, CDI etc. add-ons
- Add missing javadoc

5 files changed, 17 insertions, 17 deletions

diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OSGiUIProvider.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiUIProvider.java
index ccbd2fd546..072dcbdc02 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OSGiUIProvider.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiUIProvider.java
@@ -32,11 +32,11 @@ import com.vaadin.ui.UI;
  * @since 8.1
  */
 @SuppressWarnings("serial")
-public class OSGiUIProvider extends UIProvider {
+public class OsgiUIProvider extends UIProvider {
     private Class<UI> uiClass;
 
     @SuppressWarnings("unchecked")
-    public OSGiUIProvider(ServiceObjects<UI> serviceObjects) {
+    public OsgiUIProvider(ServiceObjects<UI> serviceObjects) {
         super();
         UI ui = serviceObjects.getService();
         uiClass = (Class<UI>) ui.getClass();
diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinOSGiPortlet.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiVaadinPortlet.java
index e604ec353c..0d6c648fc8 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinOSGiPortlet.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiVaadinPortlet.java
@@ -22,7 +22,7 @@ import com.vaadin.server.VaadinPortletService;
 import com.vaadin.ui.UI;
 
 /**
- * {@link VaadinPortlet} that uses an {@link OSGiUIProvider} to configure its
+ * {@link VaadinPortlet} that uses an {@link OsgiUIProvider} to configure its
  * {@link UI}.
  * <p>
  * This only applies to Liferay Portal 7+ with OSGi support.
@@ -32,17 +32,17 @@ import com.vaadin.ui.UI;
  * @since 8.1
  */
 @SuppressWarnings("serial")
-public class VaadinOSGiPortlet extends VaadinPortlet {
-    private OSGiUIProvider uiProvider;
+public class OsgiVaadinPortlet extends VaadinPortlet {
+    private OsgiUIProvider uiProvider;
 
-    public VaadinOSGiPortlet(OSGiUIProvider uiProvider) {
+    public OsgiVaadinPortlet(OsgiUIProvider uiProvider) {
         this.uiProvider = uiProvider;
     }
 
     @Override
     protected VaadinPortletService createPortletService(
             DeploymentConfiguration configuration) throws ServiceException {
-        OSGiVaadinPortletService osgiVaadinPortletService = new OSGiVaadinPortletService(
+        OsgiVaadinPortletService osgiVaadinPortletService = new OsgiVaadinPortletService(
                 this, configuration, uiProvider);
         osgiVaadinPortletService.init();
         return osgiVaadinPortletService;
diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OSGiVaadinPortletService.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiVaadinPortletService.java
index c203fc4f3c..38858ec12f 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OSGiVaadinPortletService.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/OsgiVaadinPortletService.java
@@ -25,7 +25,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.UI;
 
 /**
- * {@link VaadinPortletService} class that uses the {@link OSGiUIProvider} to
+ * {@link VaadinPortletService} class that uses the {@link OsgiUIProvider} to
  * configure the {@link UI} class for a {@link VaadinPortlet}.
  * <p>
  * This only applies to Liferay Portal 7+ with OSGi support.
@@ -35,12 +35,12 @@ import com.vaadin.ui.UI;
  * @since 8.1
  */
 @SuppressWarnings("serial")
-public class OSGiVaadinPortletService extends VaadinPortletService {
-    private OSGiUIProvider osgiUIProvider;
+public class OsgiVaadinPortletService extends VaadinPortletService {
+    private OsgiUIProvider osgiUIProvider;
 
-    public OSGiVaadinPortletService(VaadinPortlet portlet,
+    public OsgiVaadinPortletService(VaadinPortlet portlet,
             DeploymentConfiguration deploymentConfiguration,
-            OSGiUIProvider osgiUIProvider) throws ServiceException {
+            OsgiUIProvider osgiUIProvider) throws ServiceException {
 
         super(portlet, deploymentConfiguration);
         this.osgiUIProvider = osgiUIProvider;
diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/PortletUIServiceTrackerCustomizer.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/PortletUIServiceTrackerCustomizer.java
index 0fc7c1eba8..077730d2a8 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/PortletUIServiceTrackerCustomizer.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/PortletUIServiceTrackerCustomizer.java
@@ -102,7 +102,7 @@ class PortletUIServiceTrackerCustomizer
         ServiceObjects<UI> serviceObjects = bundleContext
                 .getServiceObjects(reference);
 
-        OSGiUIProvider uiProvider = new OSGiUIProvider(serviceObjects);
+        OsgiUIProvider uiProvider = new OsgiUIProvider(serviceObjects);
 
         Dictionary<String, Object> properties = null;
         if (configuration != null) {
@@ -112,7 +112,7 @@ class PortletUIServiceTrackerCustomizer
             properties = createPortletProperties(reference);
         }
 
-        VaadinOSGiPortlet portlet = new VaadinOSGiPortlet(uiProvider);
+        OsgiVaadinPortlet portlet = new OsgiVaadinPortlet(uiProvider);
 
         ServiceRegistration<Portlet> serviceRegistration = bundleContext
                 .registerService(Portlet.class, portlet, properties);
@@ -123,7 +123,7 @@ class PortletUIServiceTrackerCustomizer
     }
 
     private Dictionary<String, Object> createPortletProperties(
-            OSGiUIProvider uiProvider, ServiceReference<UI> reference,
+            OsgiUIProvider uiProvider, ServiceReference<UI> reference,
             VaadinLiferayPortletConfiguration configuration) {
 
         Hashtable<String, Object> properties = new Hashtable<String, Object>();
diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
index 046fc489ae..78d0bff383 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
@@ -23,7 +23,7 @@ import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.util.tracker.ServiceTracker;
 
-import com.vaadin.osgi.resources.OSGiVaadinResources;
+import com.vaadin.osgi.resources.OsgiVaadinResources;
 import com.vaadin.osgi.resources.VaadinResourceService;
 import com.vaadin.ui.UI;
 
@@ -46,7 +46,7 @@ public class VaadinPortletProvider {
     @Activate
     void activate(ComponentContext componentContext) throws Exception {
         BundleContext bundleContext = componentContext.getBundleContext();
-        VaadinResourceService service = OSGiVaadinResources.getService();
+        VaadinResourceService service = OsgiVaadinResources.getService();
 
         portletUIServiceTrackerCustomizer = new PortletUIServiceTrackerCustomizer(
                 service);