You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/03/14 19:26:28 UTC
[1/2] incubator-tamaya git commit: Fixed quality issues and compile
errors.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 343531a49 -> cb425996a
Fixed quality issues and compile errors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/8873c202
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/8873c202
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/8873c202
Branch: refs/heads/master
Commit: 8873c202b0fa7e46df17f77d55d8dc04ce43f041
Parents: 343531a
Author: anatole <an...@apache.org>
Authored: Mon Mar 14 19:24:41 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Mar 14 19:24:41 2016 +0100
----------------------------------------------------------------------
.../tamaya/examples/fileobserver/TestConfigView.java | 6 ++++++
.../mutableconfig/propertysources/TransactionContext.java | 10 ++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8873c202/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
index 060c61e..c04fb62 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -71,6 +72,11 @@ public class TestConfigView implements ConfigOperator{
}
@Override
+ public ConfigurationContext getContext() {
+ return null;
+ }
+
+ @Override
public String get(String key) {
return getProperties().get(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8873c202/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
index 2b417d9..b8604f6 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
@@ -123,11 +123,13 @@ public final class TransactionContext{
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof TransactionContext)) return false;
-
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof TransactionContext)) {
+ return false;
+ }
TransactionContext that = (TransactionContext) o;
-
return transactionId.equals(that.transactionId);
}
[2/2] incubator-tamaya git commit: Fixed quality issues and compile
errors.
Posted by an...@apache.org.
Fixed quality issues and compile errors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/cb425996
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/cb425996
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/cb425996
Branch: refs/heads/master
Commit: cb425996a7ecb8eddeb55cd8e0d09a9f80ce0f73
Parents: 8873c20
Author: anatole <an...@apache.org>
Authored: Mon Mar 14 19:25:05 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Mar 14 19:25:05 2016 +0100
----------------------------------------------------------------------
.../tamaya/mutableconfig/MutableConfigurationProvider.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cb425996/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
index 56c0e2a..67e971f 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
@@ -43,7 +43,7 @@ public final class MutableConfigurationProvider {
/**
* URIs used by this query instance to identify the backends to use for write operations.
*/
- private static final MutableConfigurationProviderSpi mutableConfigurationProviderSpi = loadSpi();
+ private static MutableConfigurationProviderSpi mutableConfigurationProviderSpi = loadSpi();
/**
* SPI loader method.
@@ -53,8 +53,8 @@ public final class MutableConfigurationProvider {
private static MutableConfigurationProviderSpi loadSpi() {
try{
return ServiceContextManager.getServiceContext().getService(
- MutableConfigurationProviderSpi.class) ; }
- catch(Exception e){
+ MutableConfigurationProviderSpi.class) ;
+ } catch(Exception e){
throw new ConfigException("Failed to initialize MutableConfigurationProviderSpi - " +
"mutable configuration support.");
}