juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [1/4] juneau git commit: (JUNEAU-76) Improvements to Context/Builder APIs
Date Sat, 23 Dec 2017 17:10:23 GMT
Repository: juneau
Updated Branches:
  refs/heads/master e2b108f2e -> b49b91926


http://git-wip-us.apache.org/repos/asf/juneau/blob/b49b9192/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
index 2f1223b..291f56b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
@@ -37,7 +37,7 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	 *
 	 * @param ps The initial configuration settings for this builder.
 	 */
-	public YamlSerializerBuilder(PropertyStore2 ps) {
+	public YamlSerializerBuilder(PropertyStore ps) {
 		super(ps);
 	}
 
@@ -631,7 +631,7 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* ContextBuilder */
-	public YamlSerializerBuilder apply(PropertyStore2 copyFrom) {
+	public YamlSerializerBuilder apply(PropertyStore copyFrom) {
 		super.apply(copyFrom);
 		return this;
 	}

http://git-wip-us.apache.org/repos/asf/juneau/blob/b49b9192/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 8d8dd2f..62ca444 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -106,7 +106,7 @@ public class RestClient extends BeanContext {
 	}
 
 	RestClient(
-			PropertyStore2 ps,
+			PropertyStore ps,
 			CloseableHttpClient httpClient,
 			boolean keepHttpClientOpen,
 			Serializer serializer,

http://git-wip-us.apache.org/repos/asf/juneau/blob/b49b9192/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 9abfae7..c8bddb3 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -123,7 +123,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 *
 	 * @param ps The initial configuration settings for this builder.
 	 */
-	public RestClientBuilder(PropertyStore2 ps) {
+	public RestClientBuilder(PropertyStore ps) {
 		super(ps);
 	}
 
@@ -135,7 +135,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 			if (httpClient == null)
 				httpClient = createHttpClient();
 			
-			PropertyStore2 ps = psb.build();
+			PropertyStore ps = psb.build();
 
 			Serializer s =
 				this.serializer != null

http://git-wip-us.apache.org/repos/asf/juneau/blob/b49b9192/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java
index 5199186..9c9f56a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java
@@ -1326,12 +1326,12 @@ public class RestConfig implements ServletConfig {
 	}
 
 	/**
-	 * Creates a new {@link PropertyStore2} object initialized with the properties defined in
this config.
+	 * Creates a new {@link PropertyStore} object initialized with the properties defined in
this config.
 	 *
 	 * @return A new property store.
 	 */
 	protected PropertyStoreBuilder createPropertyStore() {
-		return PropertyStore2.create().add(properties);
+		return PropertyStore.create().add(properties);
 	}
 
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/b49b9192/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index a736681..6a23baf 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -52,7 +52,7 @@ import org.apache.juneau.utils.*;
  * Contains all the configuration on a REST resource and the entry points for handling REST
calls.
  *
  * <p>
- * See {@link PropertyStore2} for more information about context properties.
+ * See {@link PropertyStore} for more information about context properties.
  */
 public final class RestContext extends Context {
 
@@ -150,7 +150,7 @@ public final class RestContext extends Context {
 	 */
 	@SuppressWarnings("unchecked")
 	public RestContext(Object resource, ServletContext servletContext, RestConfig config) throws
Exception {
-		super(PropertyStore2.DEFAULT);
+		super(PropertyStore.DEFAULT);
 		RestException _initException = null;
 		try {
 			this.resource = resource;


Mime
View raw message