Release 1807.1-1

connectors-api/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.coremedia.blueprint.connectors</groupId>
     <artifactId>connectors</artifactId>
-    <version>1804.3-1</version>
+    <version>1807.1-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,14 +14,10 @@
     <!-- CoreMedia Dependencies -->
     <!-- Thirdparty Dependencies -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorCategory.java

@@ -6,8 +6,8 @@
 import com.coremedia.cap.content.Content;
 
 import javax.activation.MimeType;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
@@ -25,20 +25,20 @@ public interface ConnectorCategory extends ConnectorEntity {
    */
   String DEFAULT_TYPE = "folder";
 
-  @Nonnull
+  @NonNull
   List<ConnectorCategory> getSubCategories();
 
   /**
    * Returns a list of child items for this category.
    */
-  @Nonnull
+  @NonNull
   List<ConnectorItem> getItems();
 
   /**
    * Optional method that can be implemented to provide a custom column model inside the Studio library.
    * The given column models will be shown in the the order they are added to the list.
    */
-  @Nonnull
+  @NonNull
   default List<ConnectorColumn> getColumns() {
     return Collections.emptyList();
   }
@@ -64,7 +64,7 @@ default boolean isContentUploadEnabled() {
    * @param defaultAction true, if the default action was used (no CTRL was pressed)
    * @return true if the drop was successful
    */
-  default boolean uploadContent(@Nonnull ConnectorContext context, @Nonnull List<Content> contents, Boolean defaultAction) {
+  default boolean uploadContent(@NonNull ConnectorContext context, @NonNull List<Content> contents, Boolean defaultAction) {
     for (Content content : contents) {
       List<CapPropertyDescriptor> descriptors = content.getType().getDescriptors();
       for (CapPropertyDescriptor descriptor : descriptors) {
@@ -96,7 +96,7 @@ default String getType() {
    * Called to refresh the service
    * @return true if the operation was successful
    */
-  default Boolean refresh(@Nonnull ConnectorContext context) {
+  default boolean refresh(@NonNull ConnectorContext context) {
     return true;
   }
 
@@ -108,7 +108,7 @@ default Boolean refresh(@Nonnull ConnectorContext context) {
    * @return the newly created item created from the stream or null if not upload is provided
    */
   @Nullable
-  default ConnectorItem upload(@Nonnull ConnectorContext context, String itemName, InputStream inputStream) {
+  default ConnectorItem upload(@NonNull ConnectorContext context, String itemName, InputStream inputStream) {
     return null;
   }
 }

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorColumn.java

@@ -1,6 +1,6 @@
 package com.coremedia.blueprint.connectors.api;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * The Column interface to be implemented for a custom column inside the library view.
@@ -10,13 +10,13 @@ public interface ConnectorColumn {
    * The title of the library, can return the actual label
    * or a resource bundle key of value that has been overridden in the ConnectorsStudioPlugin.properties.
    */
-  @Nonnull
+  @NonNull
   String getTitle();
 
   /**
    * The dataIndex identifies the value of the item that is rendered by this column
    */
-  @Nonnull
+  @NonNull
   String getDataIndex();
 
   /**

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorConnection.java

@@ -3,7 +3,7 @@
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.annotation.Required;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Represents the actual connection to an external system.
@@ -22,12 +22,12 @@ public class ConnectorConnection implements BeanNameAware {
   private String connectorType;
   private ConnectorContext context;
 
-  @Nonnull
+  @NonNull
   public ConnectorService getConnectorService() {
     return connectorService;
   }
 
-  @Nonnull
+  @NonNull
   public ConnectorContext getContext() {
     return context;
   }
@@ -42,12 +42,12 @@ public void setConnectorContentService(ConnectorContentService connectorContentS
     this.connectorContentService = connectorContentService;
   }
 
-  @Nonnull
+  @NonNull
   public ConnectorContentService getConnectorContentService() {
     return connectorContentService;
   }
 
-  @Nonnull
+  @NonNull
   public String getConnectorType() {
     return connectorType;
   }
@@ -57,7 +57,7 @@ public void setConnectorContext(ConnectorContext context) {
   }
 
   @Override
-  public void setBeanName(@Nonnull String beanName) {
+  public void setBeanName(@NonNull String beanName) {
     if(!beanName.startsWith(CONNECTOR_PREFIX + ":")) {
       throw new UnsupportedOperationException("ConnectorConnection bean name must have a leading " + CONNECTOR_PREFIX + ": prefix");
     }

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorContentMappings.java

@@ -1,8 +1,6 @@
 package com.coremedia.blueprint.connectors.api;
 
-import org.springframework.lang.NonNull;
-
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Map;
 
 /**
@@ -13,15 +11,15 @@ public interface ConnectorContentMappings {
   /**
    * Returns all content mapping properties as map
    */
-  @Nonnull
+  @NonNull
   Map<String,Object> getProperties();
 
   /**
    * Returns the content type that should be created for the given connector item type
    * @param type the type name of a connector item
    * @return null or a target content content
    */
-  @Nonnull
+  @NonNull
   String get(String type);
 
   /**

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorContentService.java

@@ -3,8 +3,8 @@
 import com.coremedia.cap.content.Content;
 import com.coremedia.cap.multisite.Site;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * Interface for the content service which manages the lookup of duplicates, content creation and
@@ -21,7 +21,7 @@ public interface ConnectorContentService {
    * @return
    */
   @Nullable
-  Content createContent(@Nonnull ConnectorId connectorId, @Nonnull String folder, @Nullable Site site);
+  Content createContent(@NonNull ConnectorId connectorId, @NonNull String folder, @Nullable Site site);
 
   /**
    * Tries to find the content that has been created for the given connector id
@@ -31,7 +31,7 @@ public interface ConnectorContentService {
    * @param site the site used as search filter for the content or null for a global lookup
    */
   @Nullable
-  Content findContent(@Nonnull ConnectorEntity entity, @Nullable String folder, @Nullable Site site);
+  Content findContent(@NonNull ConnectorEntity entity, @Nullable String folder, @Nullable Site site);
 
   /**
    * Triggers the (asynchronous) post processing of content.
@@ -41,12 +41,12 @@ public interface ConnectorContentService {
    * @param entity the entity that contains the external system data
    * @param wait true to wait until the post processing is finished.
    */
-  void processContent(@Nonnull Content content, @Nonnull ConnectorEntity entity, boolean wait);
+  void processContent(@NonNull Content content, @NonNull ConnectorEntity entity, boolean wait);
 
   /**
    * Applies the connectorId to the localSettings struct
    * @param content the content to apply the id for
    * @param id      the id to set
    */
-  void setConnectorId(@Nonnull Content content, @Nonnull ConnectorId id);
+  void setConnectorId(@NonNull Content content, @NonNull ConnectorId id);
 }

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorContentUploadTypes.java

@@ -2,8 +2,8 @@
 
 import com.coremedia.cap.content.ContentType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Map;
 
 /**
@@ -17,7 +17,7 @@ public interface ConnectorContentUploadTypes {
   /**
    * Returns all content mapping properties as map
    */
-  @Nonnull
+  @NonNull
   Map<String,Object> getProperties();
 
   /**

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorContext.java

@@ -2,8 +2,8 @@
 
 import com.coremedia.cap.multisite.Site;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;
 import java.util.Locale;
 
@@ -17,13 +17,13 @@ public interface ConnectorContext {
    * Returns the connectionId of the connection this context belongs too.
    * This id must be unique over all sites.
    */
-  @Nonnull
+  @NonNull
   String getConnectionId();
 
   /**
    * Returns the connector type for this context, as defined in the Connections.xml
    */
-  @Nonnull
+  @NonNull
   String getType();
 
   /**
@@ -35,14 +35,14 @@ public interface ConnectorContext {
   /**
    * Returns the name that has been set for the connector type name in 'Connector Types'.
    */
-  @Nonnull
+  @NonNull
   String getTypeName();
 
   /**
    * Utility methods to access additional configuration parameters.
    */
   String getProperty(String key);
-  Boolean getBooleanProperty(String key, boolean defaultValue);
+  boolean getBooleanProperty(String key, boolean defaultValue);
 
   /**
    * Returns the threshold im MB that is used for the item preview.
@@ -82,14 +82,14 @@ public interface ConnectorContext {
    * Returns the list of user groups that are notified for this connection context.
    * @return a list with cap group names
    */
-  @Nonnull
+  @NonNull
   List<String> getNotificationsUserGroups();
 
   /**
    * Returns a list of user names that are notified for this connection context.
    * @return a list with cap user names
    */
-  @Nonnull
+  @NonNull
   List<String> getNotificationsUsers();
 
   /**
@@ -129,7 +129,7 @@ public interface ConnectorContext {
    * Returns the locale that should be used for this connector.
    * The locale matches the one that is set for the current Studio user.
    */
-  @Nonnull
+  @NonNull
   Locale getLocale();
 
   /**
@@ -149,7 +149,7 @@ public interface ConnectorContext {
    * Custom columns are not affected by this.
    * @return the list of default columns to display.
    */
-  @Nonnull
+  @NonNull
   List<String> getDefaultColumns();
 
   /**

connectors-api/src/main/java/com/coremedia/blueprint/connectors/api/ConnectorEntity.java

@@ -1,9 +1,7 @@
 package com.coremedia.blueprint.connectors.api;
 
-import org.springframework.lang.NonNull;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -13,19 +11,19 @@
  */
 public interface ConnectorEntity {
 
-  @Nonnull
+  @NonNull
   ConnectorId getConnectorId();
 
-  @Nonnull
+  @NonNull
   String getName();
 
-  @Nonnull
+  @NonNull
   ConnectorContext getContext();
 
   @Nullable
   ConnectorCategory getParent();
 
-  @Nonnull
+  @NonNull
   String getDisplayName();
 
   /**
@@ -64,13 +62,13 @@ default String getThumbnailUrl() {
   /**
    * Returns true if it is possible to delete the given item or category.
    */
-  Boolean isDeleteable();
+  boolean isDeleteable();
 
   /**
    * Method to be implemented when a connector item or category should be deleted.
    * @return true if the deletion operation was successful.
    */
-  Boolean delete();
+  boolean delete();
 
   /**
    * Optional additional metadata that will be used for the metadata-preview-panel in the library.