You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/23 16:55:33 UTC

juneau git commit: Remove duplicate BeanContext in CoreObject.

Repository: juneau
Updated Branches:
  refs/heads/master 8b8531163 -> f8e83833b


Remove duplicate BeanContext in CoreObject.

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

Branch: refs/heads/master
Commit: f8e83833be11dfc7b4c07fb2cbf0d6c06e49a9e2
Parents: 8b85311
Author: JamesBognar <ja...@apache.org>
Authored: Mon Oct 23 12:55:30 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Mon Oct 23 12:55:30 2017 -0400

----------------------------------------------------------------------
 .../org/apache/juneau/ini/ConfigFileImpl.java   |  2 +-
 .../main/java/org/apache/juneau/CoreObject.java | 28 --------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juneau/blob/f8e83833/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
index 05e1f00..6a3c8b0 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
@@ -97,7 +97,7 @@ public final class ConfigFileImpl extends ConfigFile {
 			for (Section s : sections.values())
 				s.setReadOnly();
 		}
-		this.pBeanSession = this.parser.getBeanContext().createSession();
+		this.pBeanSession = this.parser.createSession();
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/juneau/blob/f8e83833/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/CoreObject.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/CoreObject.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/CoreObject.java
index 9e92d8d..d6f8005 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/CoreObject.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/CoreObject.java
@@ -71,32 +71,4 @@ public abstract class CoreObject {
 	public BeanContext getBeanContext() {
 		return beanContext;
 	}
-
-	/**
-	 * Returns the universal <code>Object</code> metadata object.
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>getBeanContext().object();</code>.
-	 * </ul>
-	 *
-	 * @return The reusable {@link ClassMeta} for representing the {@link Object} class.
-	 */
-	public ClassMeta<Object> object() {
-		return getBeanContext().object();
-	}
-
-	/**
-	 * Returns the universal <code>String</code> metadata object.
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>getBeanContext().string();</code>.
-	 * </ul>
-	 *
-	 * @return The reusable {@link ClassMeta} for representing the {@link String} class.
-	 */
-	public ClassMeta<String> string() {
-		return getBeanContext().string();
-	}
 }