This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new c68451d  ISIS-1841 IsisJdoSupport aliases removed
c68451d is described below

commit c68451d7a502b1021f0ebd3ba135710ccb140fbb
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Mar 7 15:06:36 2018 +0100

    ISIS-1841 IsisJdoSupport aliases removed
    
    instead use one of IsisJdoSupport_v3_1, IsisJdoSupport_v3_2 or
    IsisJdoSupport0 (for jdo-api version independent methods only)
---
 .../applib/services/jdosupport/IsisJdoSupport.java | 27 ----------------------
 ...JdoSupportImpl4.java => IsisJdoSupportDN4.java} |  2 +-
 ...isJdoSupport4.java => IsisJdoSupport_v3_1.java} |  2 +-
 .../applib/services/jdosupport/IsisJdoSupport.java | 26 ---------------------
 ...JdoSupportImpl5.java => IsisJdoSupportDN5.java} |  2 +-
 ...isJdoSupport5.java => IsisJdoSupport_v3_2.java} |  3 ++-
 6 files changed, 5 insertions(+), 57 deletions(-)

diff --git 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
 
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
deleted file mode 100644
index 028dcd2..0000000
--- 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  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.
- */
-
-package org.apache.isis.applib.services.jdosupport;
-
-/**
- * 
- * Just an alias.
- * 
- */
-public interface IsisJdoSupport extends IsisJdoSupport4 {
-
-}
diff --git 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl4.java
 
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
similarity index 99%
rename from 
core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl4.java
rename to 
core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
index 9986096..1c6e170 100644
--- 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl4.java
+++ 
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
@@ -62,7 +62,7 @@ import com.google.common.collect.Maps;
         nature = NatureOfService.DOMAIN,
         menuOrder = "" + Integer.MAX_VALUE
 )
-public class IsisJdoSupportImpl4 implements IsisJdoSupport4 {
+public class IsisJdoSupportDN4 implements IsisJdoSupport_v3_1 {
     
     @Programmatic
     @Override
diff --git 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport4.java
 
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
similarity index 96%
rename from 
core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport4.java
rename to 
core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
index afa62db..d7b7f19 100644
--- 
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport4.java
+++ 
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_1.java
@@ -29,7 +29,7 @@ import org.datanucleus.query.typesafe.TypesafeQuery;
 /**
  * Service that provide a number of workarounds when using JDO/DataNucleus. 
  */
-public interface IsisJdoSupport4 extends 
org.apache.isis.applib.services.jdosupport.IsisJdoSupport0 {
+public interface IsisJdoSupport_v3_1 extends 
org.apache.isis.applib.services.jdosupport.IsisJdoSupport0 {
 
        /**
         * To perform the most common use-case of executing a (type-safe) query 
against the specified class,
diff --git 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
 
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
deleted file mode 100644
index de412b7..0000000
--- 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  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.
- */
-package org.apache.isis.applib.services.jdosupport;
-
-/**
- * 
- * Just an alias.
- *
- */
-public interface IsisJdoSupport extends IsisJdoSupport5 {
-
-}
diff --git 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl5.java
 
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
similarity index 99%
rename from 
core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl5.java
rename to 
core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
index 8a0a07d..44145c8 100644
--- 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportImpl5.java
+++ 
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
@@ -61,7 +61,7 @@ import com.google.common.collect.Maps;
         nature = NatureOfService.DOMAIN,
         menuOrder = "" + Integer.MAX_VALUE
 )
-public class IsisJdoSupportImpl5 implements IsisJdoSupport5 {
+public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
     
     @Programmatic
     @Override
diff --git 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport5.java
 
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
similarity index 96%
rename from 
core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport5.java
rename to 
core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
index 8c5e2b2..1412927 100644
--- 
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport5.java
+++ 
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport_v3_2.java
@@ -29,7 +29,8 @@ import org.apache.isis.applib.annotation.Programmatic;
 /**
  * Service that provide a number of workarounds when using JDO/DataNucleus. 
  */
-public interface IsisJdoSupport5 extends 
org.apache.isis.applib.services.jdosupport.IsisJdoSupport0 {
+public interface IsisJdoSupport_v3_2 extends 
org.apache.isis.applib.services.jdosupport.IsisJdoSupport0 
+{
 
     /**
      * To perform the most common use-case of executing a (type-safe) query 
against the specified class,

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

Reply via email to