Fixed build and validation issues and some tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/58647a42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/58647a42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/58647a42 Branch: refs/heads/master Commit: 58647a42990191fc4d2c1f4eb01a9e1ccee29784 Parents: 12999b7 Author: anatole <anat...@apache.org> Authored: Sat Apr 30 21:37:15 2016 +0200 Committer: anatole <anat...@apache.org> Committed: Sat Apr 30 21:37:15 2016 +0200 ---------------------------------------------------------------------- .../org/apache/tamaya/model/UsageReference.java | 45 -------------------- .../ConfiguredPropertiesModelProviderSpi.java | 1 - .../tamaya/model/spi/ConfigModelReader.java | 2 - .../java/test/model/TestConfigAccessor.java | 18 ++++++++ .../mutableconfig/ui/ConfigEditorWidget.java | 6 ++- .../mutableconfig/ui/ConfigUpdaterView.java | 2 +- .../ui/TransactionControlWidget.java | 15 +++---- 7 files changed, 30 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/model/src/main/java/org/apache/tamaya/model/UsageReference.java ---------------------------------------------------------------------- diff --git a/model/src/main/java/org/apache/tamaya/model/UsageReference.java b/model/src/main/java/org/apache/tamaya/model/UsageReference.java deleted file mode 100644 index 3504def..0000000 --- a/model/src/main/java/org/apache/tamaya/model/UsageReference.java +++ /dev/null @@ -1,45 +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.tamaya.model; - -import java.util.*; -import java.util.concurrent.atomic.AtomicLong; - -/** - * Reference object store for a parameter or configuration accessed. - */ -public class UsageReference { - - private String reference; - - - public UsageReference(String reference){ - this.reference = Objects.requireNonNull(reference); - } - - /** - * Access the package name which accessed the configuration. - * @return the package name, never null. - */ - public String getReference(){ - return reference; - } - - -} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/model/src/main/java/org/apache/tamaya/model/internal/ConfiguredPropertiesModelProviderSpi.java ---------------------------------------------------------------------- diff --git a/model/src/main/java/org/apache/tamaya/model/internal/ConfiguredPropertiesModelProviderSpi.java b/model/src/main/java/org/apache/tamaya/model/internal/ConfiguredPropertiesModelProviderSpi.java index a292e49..62158da 100644 --- a/model/src/main/java/org/apache/tamaya/model/internal/ConfiguredPropertiesModelProviderSpi.java +++ b/model/src/main/java/org/apache/tamaya/model/internal/ConfiguredPropertiesModelProviderSpi.java @@ -22,7 +22,6 @@ import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.model.ConfigModel; import org.apache.tamaya.model.spi.ConfigModelReader; import org.apache.tamaya.model.spi.ModelProviderSpi; -import org.apache.tamaya.spisupport.BasePropertySource; import org.apache.tamaya.spisupport.MapPropertySource; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/model/src/main/java/org/apache/tamaya/model/spi/ConfigModelReader.java ---------------------------------------------------------------------- diff --git a/model/src/main/java/org/apache/tamaya/model/spi/ConfigModelReader.java b/model/src/main/java/org/apache/tamaya/model/spi/ConfigModelReader.java index 6a69748..b380051 100644 --- a/model/src/main/java/org/apache/tamaya/model/spi/ConfigModelReader.java +++ b/model/src/main/java/org/apache/tamaya/model/spi/ConfigModelReader.java @@ -20,11 +20,9 @@ package org.apache.tamaya.model.spi; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import org.apache.tamaya.model.ConfigModel; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/model/src/test/java/test/model/TestConfigAccessor.java ---------------------------------------------------------------------- diff --git a/model/src/test/java/test/model/TestConfigAccessor.java b/model/src/test/java/test/model/TestConfigAccessor.java index 191a074..498d2b6 100644 --- a/model/src/test/java/test/model/TestConfigAccessor.java +++ b/model/src/test/java/test/model/TestConfigAccessor.java @@ -1,3 +1,21 @@ +/* + * 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 test.model; import org.apache.tamaya.Configuration; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigEditorWidget.java ---------------------------------------------------------------------- diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigEditorWidget.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigEditorWidget.java index 02e486b..7f0100f 100644 --- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigEditorWidget.java +++ b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigEditorWidget.java @@ -18,7 +18,11 @@ */ package org.apache.tamaya.mutableconfig.ui; -import com.vaadin.ui.*; +import com.vaadin.ui.Button; +import com.vaadin.ui.FormLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.TextField; import org.apache.tamaya.mutableconfig.MutableConfiguration; import org.apache.tamaya.spi.ServiceContextManager; import org.apache.tamaya.ui.services.MessageProvider; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigUpdaterView.java ---------------------------------------------------------------------- diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigUpdaterView.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigUpdaterView.java index ea33d22..2ca3646 100644 --- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigUpdaterView.java +++ b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/ConfigUpdaterView.java @@ -21,7 +21,7 @@ package org.apache.tamaya.mutableconfig.ui; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.ui.*; +import com.vaadin.ui.Label; import org.apache.tamaya.mutableconfig.MutableConfiguration; import org.apache.tamaya.mutableconfig.MutableConfigurationProvider; import org.apache.tamaya.mutableconfig.spi.MutablePropertySource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/58647a42/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/TransactionControlWidget.java ---------------------------------------------------------------------- diff --git a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/TransactionControlWidget.java b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/TransactionControlWidget.java index 73f4a18..49222c8 100644 --- a/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/TransactionControlWidget.java +++ b/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ui/TransactionControlWidget.java @@ -19,22 +19,19 @@ package org.apache.tamaya.mutableconfig.ui; import com.vaadin.data.Property; -import com.vaadin.navigator.View; -import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.ui.*; +import com.vaadin.ui.Button; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Notification; +import com.vaadin.ui.TextField; import org.apache.tamaya.mutableconfig.ChangePropagationPolicy; import org.apache.tamaya.mutableconfig.MutableConfiguration; import org.apache.tamaya.mutableconfig.MutableConfigurationProvider; -import org.apache.tamaya.mutableconfig.spi.MutablePropertySource; import org.apache.tamaya.spi.ServiceContextManager; -import org.apache.tamaya.ui.UIConstants; -import org.apache.tamaya.ui.ViewProvider; import org.apache.tamaya.ui.components.VerticalSpacedLayout; import org.apache.tamaya.ui.services.MessageProvider; -import javax.annotation.Priority; -import java.io.PrintWriter; import java.util.Arrays; import java.util.Objects;