You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/04/26 00:39:51 UTC

[1/2] incubator-tamaya git commit: Added rule to detect empty service configurations.

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master fd00b28aa -> eb522bef8


Added rule to detect empty service configurations.


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

Branch: refs/heads/master
Commit: c56886c367351e97e02fc2c9d691714e934076e9
Parents: fd00b28
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sun Apr 26 00:25:19 2015 +0200
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sun Apr 26 00:25:19 2015 +0200

----------------------------------------------------------------------
 jqassistant/default.xml             |  1 +
 jqassistant/serviceloader-rules.xml | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c56886c3/jqassistant/default.xml
----------------------------------------------------------------------
diff --git a/jqassistant/default.xml b/jqassistant/default.xml
index f35def2..83caeed 100644
--- a/jqassistant/default.xml
+++ b/jqassistant/default.xml
@@ -57,5 +57,6 @@ under the License.
         <includeConstraint refId="naming:namingOfPropertyFilters"/>
         <includeConstraint refId="serviceLoader:correctServiceLoaderNaming"/>
         <includeConstraint refId="serviceLoader:ServiceImplementationsMustBeListedInServiceConfigurations"/>
+        <includeConstraint refId="serviceLoader:serviceConfigurationsMustNotBeEmpty"/>
     </group>
 </jqa:jqassistant-rules>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c56886c3/jqassistant/serviceloader-rules.xml
----------------------------------------------------------------------
diff --git a/jqassistant/serviceloader-rules.xml b/jqassistant/serviceloader-rules.xml
index 346ebb8..cb8ee42 100644
--- a/jqassistant/serviceloader-rules.xml
+++ b/jqassistant/serviceloader-rules.xml
@@ -84,10 +84,18 @@ under the License.
         ]]></cypher>
 	</constraint>
 
-	<!-- @todo
-      Constraints to be defined
-      - Empty service configurations
+    <constraint id="serviceLoader:serviceConfigurationsMustNotBeEmpty">
+        <requiresConcept refId="serviceLoader:SPI"/>
+        <description>Empty service configurations must not be provided.</description>
+        <cypher><![CDATA[
+            MATCH
+                (sc:ServiceLoader)
 
-      -->
+            WHERE
+                NOT (sc)-[:CONTAINS]->()
 
+            RETURN
+                sc.fileName AS emptyServiceConfiguration
+        ]]></cypher>
+    </constraint>
 </jqa:jqassistant-rules>


[2/2] incubator-tamaya git commit: Removed empty service configuration from the JSON module.

Posted by pl...@apache.org.
Removed empty service configuration from the JSON module.


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

Branch: refs/heads/master
Commit: eb522bef8c0d93fc3e1941ef710060ed2745012f
Parents: c56886c
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sun Apr 26 00:39:15 2015 +0200
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sun Apr 26 00:39:15 2015 +0200

----------------------------------------------------------------------
 .../org.apache.tamaya.spi.PropertySourceProvider  | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/eb522bef/modules/json/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
----------------------------------------------------------------------
diff --git a/modules/json/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider b/modules/json/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
deleted file mode 100644
index f3199f2..0000000
--- a/modules/json/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
+++ /dev/null
@@ -1,18 +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 current 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.
-#