Update to travis-ci.com

README.md

@@ -1,6 +1,6 @@
 <img src="https://persistence.blazebit.com/images/blaze_persistence_logo_colors_render.png" width="200" />
 
-[![Build Status](https://travis-ci.org/Blazebit/blaze-persistence.svg?branch=master)](https://travis-ci.org/Blazebit/blaze-persistence)
+[![Build Status](https://travis-ci.com/Blazebit/blaze-persistence.svg?branch=master)](https://travis-ci.com/Blazebit/blaze-persistence)
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.blazebit/blaze-persistence-core-impl/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.blazebit/blaze-persistence-core-impl)
 [![Slack Status](https://blazebit.herokuapp.com/badge.svg)](https://blazebit.herokuapp.com)

core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java

@@ -21,6 +21,8 @@
 import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoH2;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42;
+import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL;
 import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA;
 import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable;
@@ -386,7 +388,9 @@ public void work(EntityManager em) {
         });
     }
 
+    // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals...
     @Test
+    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class })
     public void updateKeyedWithInlineCte() {
         transactional(new TxVoidWork() {
             @Override

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/AbstractMethodAttribute.java

@@ -75,12 +75,16 @@ protected AbstractMethodAttribute(ManagedViewTypeImplementor<X> viewType, Method
         this.name = mapping.getName();
         this.javaMethod = mapping.getMethod();
 
-        Map<String, AttributeFilterMapping> filterMappings = new HashMap<String, AttributeFilterMapping>();
-        for (Map.Entry<String, Class<? extends AttributeFilterProvider>> entry : mapping.getAttributeFilterProviders().entrySet()) {
-            filterMappings.put(entry.getKey(), new AttributeFilterMappingImpl(this, entry.getKey(), entry.getValue()));
-        }
+        if (mapping.getAttributeFilterProviders() == null) {
+            this.filterMappings = Collections.emptyMap();
+        } else {
+            Map<String, AttributeFilterMapping> filterMappings = new HashMap<String, AttributeFilterMapping>();
+            for (Map.Entry<String, Class<? extends AttributeFilterProvider>> entry : mapping.getAttributeFilterProviders().entrySet()) {
+                filterMappings.put(entry.getKey(), new AttributeFilterMappingImpl(this, entry.getKey(), entry.getValue()));
+            }
 
-        this.filterMappings = Collections.unmodifiableMap(filterMappings);
+            this.filterMappings = Collections.unmodifiableMap(filterMappings);
+        }
     }
 
     public Set<ManagedViewType<?>> getViewTypes() {

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/metamodel/ViewTypeImpl.java

@@ -49,11 +49,15 @@ public class ViewTypeImpl<X> extends ManagedViewTypeImpl<X> implements ViewTypeI
     public ViewTypeImpl(ViewMapping viewMapping, ManagedType<?> managedType, MetamodelBuildingContext context) {
         super(viewMapping, managedType, context, null);
 
-        Map<String, ViewFilterMapping> viewFilters = new HashMap<String, ViewFilterMapping>();
-        for (Map.Entry<String, Class<? extends ViewFilterProvider>> entry : viewMapping.getViewFilterProviders().entrySet()) {
-            viewFilters.put(entry.getKey(), new ViewFilterMappingImpl(this, entry.getKey(), entry.getValue()));
+        if (viewMapping.getViewFilterProviders() == null) {
+            this.viewFilters = Collections.emptyMap();
+        } else {
+            Map<String, ViewFilterMapping> viewFilters = new HashMap<String, ViewFilterMapping>();
+            for (Map.Entry<String, Class<? extends ViewFilterProvider>> entry : viewMapping.getViewFilterProviders().entrySet()) {
+                viewFilters.put(entry.getKey(), new ViewFilterMappingImpl(this, entry.getKey(), entry.getValue()));
+            }
+            this.viewFilters = Collections.unmodifiableMap(viewFilters);
         }
-        this.viewFilters = Collections.unmodifiableMap(viewFilters);
         this.idAttribute = viewMapping.getIdAttribute().getMethodAttribute(this, -1, -1, context, null);
 
         if (getLockMode() != LockMode.NONE) {

pom.xml

@@ -67,7 +67,7 @@
 
     <ciManagement>
         <system>travisci</system>
-        <url>https://travis-ci.org/Blazebit/blaze-persistence</url>
+        <url>https://travis-ci.com/Blazebit/blaze-persistence</url>
     </ciManagement>
 
     <licenses>

travis/before_script_mssql.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Sets up environment for Blaze-Persistence backend MSSQL at travis-ci.org
+# Sets up environment for Blaze-Persistence backend MSSQL at travis-ci.com
 #
 
 docker run -d -p 1433:1433 -e "SA_PASSWORD=Blaze-Persistence" -e ACCEPT_EULA=Y microsoft/mssql-server-linux

travis/before_script_mysql.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Sets up environment for Blaze-Persistence backend MySQL8 at travis-ci.org
+# Sets up environment for Blaze-Persistence backend MySQL8 at travis-ci.com
 #
 
 sudo service mysql stop

travis/before_script_oracle.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Sets up environment for Blaze-Persistence backend MSSQL at travis-ci.org
+# Sets up environment for Blaze-Persistence backend MSSQL at travis-ci.com
 #
 
 git clone https://github.com/wnameless/docker-oracle-xe-11g.git