tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pottlin...@apache.org
Subject incubator-tamaya git commit: TAMAYA-326: Fix bug in ordinal comparison in ServiceContextManager
Date Mon, 05 Feb 2018 20:47:20 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master db56ee226 -> 135792e9f


TAMAYA-326: Fix bug in ordinal comparison in ServiceContextManager

While adding some test coverage on the api, I found that
org.apache.tamaya.spi.ServiceContextManager has a bug as it searches for
the default service provider in loadDefaultServiceProvider.  Namely, the
"highestOrdinal" is not set after the first service provider is found,
so any following service provider with an ordinal higher than 0 will be
used, even if that ordinal is lower than the first one's.  This patch
fixes the logic, and adds tests to cover the case.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/135792e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/135792e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/135792e9

Branch: refs/heads/master
Commit: 135792e9f649693684d85d68b83a6a258e782a10
Parents: db56ee2
Author: William Lieurance <william.lieurance@namikoda.com>
Authored: Wed Jan 31 21:36:41 2018 -0600
Committer: William Lieurance <william.lieurance@namikoda.com>
Committed: Wed Jan 31 21:36:41 2018 -0600

----------------------------------------------------------------------
 .../tamaya/spi/ServiceContextManager.java       |  5 +-
 .../spi/TestLowerOrdinalServiceContext.java     | 64 ++++++++++++++++++++
 .../apache/tamaya/spi/TestServiceContext.java   |  2 +-
 .../org.apache.tamaya.spi.ServiceContext        |  3 +-
 4 files changed, 69 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/135792e9/code/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java b/code/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
index f58c27a..be287db 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ServiceContextManager.java
@@ -57,9 +57,8 @@ public final class ServiceContextManager {
         try {
             int highestOrdinal = 0;
             for (ServiceContext serviceContext : ServiceLoader.load(ServiceContext.class))
{
-                if(highestServiceContext==null){
-                    highestServiceContext = serviceContext;
-                }else if (serviceContext.ordinal() > highestOrdinal) {
+                if (highestServiceContext == null
+                        || serviceContext.ordinal() > highestOrdinal) {
                     highestServiceContext = serviceContext;
                     highestOrdinal = serviceContext.ordinal();
                 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/135792e9/code/api/src/test/java/org/apache/tamaya/spi/TestLowerOrdinalServiceContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/spi/TestLowerOrdinalServiceContext.java
b/code/api/src/test/java/org/apache/tamaya/spi/TestLowerOrdinalServiceContext.java
new file mode 100644
index 0000000..cfb812f
--- /dev/null
+++ b/code/api/src/test/java/org/apache/tamaya/spi/TestLowerOrdinalServiceContext.java
@@ -0,0 +1,64 @@
+/*
+ * 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.tamaya.spi;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.*;
+
+/**
+ * This class implements the (default)
+ * {@link org.apache.tamaya.spi.ServiceContext} interface and hereby uses the
+ * JDK {@link java.util.ServiceLoader} to load the services required.
+ */
+public final class TestLowerOrdinalServiceContext implements ServiceContext {
+
+    private final RuntimeException ex = new RuntimeException("Lower ordinal Service Context
was used.");
+
+    @Override
+    public int ordinal() {
+        return 1;
+    }
+
+    @Override
+    public <T> T getService(Class<T> serviceType) {
+        throw ex;
+    }
+
+    @Override
+    public <T> T create(Class<T> serviceType) {
+        throw ex;
+    }
+
+    @Override
+    public <T> List<T> getServices(Class<T> serviceType) {
+        throw ex;
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String resource, ClassLoader cl) throws IOException
{
+        throw ex;
+    }
+
+    @Override
+    public URL getResource(String resource, ClassLoader cl) {
+        throw ex;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/135792e9/code/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java b/code/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
index bbc3ee2..e49ae74 100644
--- a/code/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
+++ b/code/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
@@ -37,7 +37,7 @@ public final class TestServiceContext implements ServiceContext {
 
     @Override
     public int ordinal() {
-        return 1;
+        return 5;
     }
 
     @SuppressWarnings("rawtypes")

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/135792e9/code/api/src/test/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext
----------------------------------------------------------------------
diff --git a/code/api/src/test/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext
b/code/api/src/test/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext
index 199956f..13a6772 100644
--- a/code/api/src/test/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext
+++ b/code/api/src/test/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext
@@ -16,4 +16,5 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.tamaya.spi.TestServiceContext
\ No newline at end of file
+org.apache.tamaya.spi.TestServiceContext
+org.apache.tamaya.spi.TestLowerOrdinalServiceContext


Mime
View raw message