Merge branch 'master' into HEAD # Conflicts: # juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/23dc784a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/23dc784a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/23dc784a Branch: refs/heads/master Commit: 23dc784adcf80ad00b39332495bbedf2a344f875 Parents: 96cf56b 61894c8 Author: JamesBognar <[email protected]> Authored: Sat Feb 4 17:51:41 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Sat Feb 4 17:51:41 2017 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/juneau/ClassMeta.java | 9 ++++++ .../org/apache/juneau/utils/ObjectUtils.java | 32 ++++++++++++++++++++ 2 files changed, 41 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23dc784a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java ---------------------------------------------------------------------- diff --cc juneau-core/src/main/java/org/apache/juneau/ClassMeta.java index 586d0b5,f103b2a..47e3ca5 --- a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java @@@ -85,14 -85,9 +85,20 @@@ public final class ClassMeta<T> impleme remoteableMethods, // Methods annotated with @Remoteable. Contains all public methods if class is annotated with @Remotable. publicMethods; // All public methods, including static methods. final PojoSwap<?,?>[] childPojoSwaps; // Any PojoSwaps where the normal type is a subclass of this class. ++<<<<<<< HEAD + final ConcurrentHashMap<Class<?>,PojoSwap<?,?>> + childSwapMap, // Maps normal subclasses to PojoSwaps. + childUnswapMap; // Maps swap subclasses to PojoSwaps. + final PojoSwap<T,?> pojoSwap; // The object POJO swap associated with this bean (if it has one). + final BeanFilter beanFilter; // The bean filter associated with this bean (if it has one). + + private final MetadataMap extMeta; // Extended metadata + ++======= + final ConcurrentHashMap<Class<?>,PojoSwap<?,?>> + childSwapMap, // Maps normal subclasses to PojoSwaps. + childUnswapMap; // Maps swap subclasses to PojoSwaps. ++>>>>>>> master final BeanContext beanContext; // The bean context that created this object. ClassMeta<?> @@@ -423,7 -422,6 +429,10 @@@ this.remoteableMethods = _remoteableMethods; this.beanFilter = beanFilter; this.pojoSwap = ps; ++<<<<<<< HEAD + this.extMeta = new MetadataMap(); ++======= ++>>>>>>> master if (! delayedInit) init(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23dc784a/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java ---------------------------------------------------------------------- diff --cc juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java index 0000000,0000000..7cd68fe new file mode 100644 --- /dev/null +++ b/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java @@@ -1,0 -1,0 +1,32 @@@ ++// *************************************************************************************************************************** ++// * 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.juneau.utils; ++ ++/** ++ * TODO ++ */ ++public class ObjectUtils { ++// ++// private static final ConcurrentHashMap<Class<?>,ClassMetaSimple> metaCache = new ConcurrentHashMap<Class<?>,ClassMetaSimple>(); ++// ++// public static <T> T convertToType(Class<T> c, Object value, Object outer) { ++// return null; ++// ++// ClassMetaSimple<T> type = metaCache.get(c); ++// if (type == null) { ++// metaCache.putIfAbsent(c, new ClassMetaSimple<T>(c)); ++// type = metaCache.get(c); ++// } ++// ++// } ++}
