Author: mduerig
Date: Mon Mar 2 13:11:11 2015
New Revision: 1663296
URL: http://svn.apache.org/r1663296
Log:
OAK-2384: SegmentNotFoundException when keeping JCR Value references
merged revision 1662388
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ErrorValue.java
- copied unchanged from r1663288,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ErrorValue.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 2 13:11:11 2015
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663275
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663275,1663288
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1663296&r1=1663295&r2=1663296&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
Mon Mar 2 13:11:11 2015
@@ -16,26 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import java.util.List;
-import java.util.Set;
-
-import javax.jcr.PropertyType;
-import javax.jcr.Value;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
-
-import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl;
-import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
-import org.apache.jackrabbit.oak.spi.commit.Editor;
-import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.in;
import static com.google.common.collect.Iterables.any;
@@ -56,6 +36,26 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT;
import static
org.apache.jackrabbit.oak.plugins.nodetype.constraint.Constraints.valueConstraint;
+import java.util.List;
+import java.util.Set;
+
+import javax.jcr.PropertyType;
+import javax.jcr.Value;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.namepath.NamePathMapper;
+import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl;
+import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
+import org.apache.jackrabbit.oak.spi.commit.Editor;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Validator implementation that check JCR node type constraints.
*
@@ -374,7 +374,7 @@ class TypeEditor extends DefaultEditor {
for (String constraint : constraints.getValue(STRINGS)) {
Predicate<Value> predicate = valueConstraint(type, constraint);
- for (Value v : ValueFactoryImpl.createValues(property, null)) {
+ for (Value v : ValueFactoryImpl.createValues(property,
NamePathMapper.DEFAULT)) {
if (predicate.apply(v)) {
return;
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java?rev=1663296&r1=1663295&r2=1663296&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
Mon Mar 2 13:11:11 2015
@@ -27,11 +27,14 @@ import javax.jcr.RepositoryException;
import com.google.common.base.Objects;
import org.apache.jackrabbit.api.ReferenceBinary;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO document
*/
class BinaryImpl implements ReferenceBinary {
+ private static final Logger LOG =
LoggerFactory.getLogger(BinaryImpl.class);
private final ValueImpl value;
@@ -46,12 +49,12 @@ class BinaryImpl implements ReferenceBin
//-------------------------------------------------------------< Binary
>---
@Override
- public InputStream getStream() {
+ public InputStream getStream() throws RepositoryException {
return value.getBlob().getNewStream();
}
@Override
- public int read(byte[] b, long position) throws IOException {
+ public int read(byte[] b, long position) throws IOException,
RepositoryException {
InputStream stream = getStream();
try {
if (position != stream.skip(position)) {
@@ -84,7 +87,12 @@ class BinaryImpl implements ReferenceBin
@Override @CheckForNull
public String getReference() {
- return value.getBlob().getReference();
+ try {
+ return value.getBlob().getReference();
+ } catch (RepositoryException e) {
+ LOG.warn("Error getting binary reference", e);
+ return null;
+ }
}
@Override
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java?rev=1663296&r1=1663295&r2=1663296&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java
Mon Mar 2 13:11:11 2015
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.value;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.plugins.value.ValueImpl.newValue;
import java.io.IOException;
import java.io.InputStream;
@@ -87,7 +88,7 @@ public class ValueFactoryImpl implements
* @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
*/
public static Value createValue(PropertyState property, NamePathMapper
namePathMapper) {
- return new ValueImpl(property, namePathMapper);
+ return newValue(property, namePathMapper);
}
/**
@@ -99,7 +100,7 @@ public class ValueFactoryImpl implements
* @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
*/
public static Value createValue(PropertyValue property, NamePathMapper
namePathMapper) {
- return new ValueImpl(PropertyValues.create(property), namePathMapper);
+ return newValue(PropertyValues.create(property), namePathMapper);
}
/**
@@ -112,7 +113,7 @@ public class ValueFactoryImpl implements
public static List<Value> createValues(PropertyState property,
NamePathMapper namePathMapper) {
List<Value> values = Lists.newArrayList();
for (int i = 0; i < property.count(); i++) {
- values.add(new ValueImpl(property, i, namePathMapper));
+ values.add(newValue(property, i, namePathMapper));
}
return values;
}
@@ -125,7 +126,7 @@ public class ValueFactoryImpl implements
public List<Value> createValues(PropertyState property) {
List<Value> values = Lists.newArrayList();
for (int i = 0; i < property.count(); i++) {
- values.add(new ValueImpl(property, i, namePathMapper));
+ values.add(newValue(property, i, namePathMapper));
}
return values;
}
@@ -134,7 +135,7 @@ public class ValueFactoryImpl implements
@Override
public Value createValue(String value) {
- return new ValueImpl(StringPropertyState.stringProperty("", value),
namePathMapper);
+ return newValue(StringPropertyState.stringProperty("", value),
namePathMapper);
}
@Override
@@ -143,6 +144,8 @@ public class ValueFactoryImpl implements
return createBinaryValue(value);
} catch (IOException e) {
return new ErrorValue(e, PropertyType.BINARY);
+ } catch (RepositoryException e) {
+ return new ErrorValue(e, PropertyType.BINARY);
}
}
@@ -169,22 +172,22 @@ public class ValueFactoryImpl implements
@Override
public Value createValue(long value) {
- return new ValueImpl(LongPropertyState.createLongProperty("", value),
namePathMapper);
+ return newValue(LongPropertyState.createLongProperty("", value),
namePathMapper);
}
@Override
public Value createValue(double value) {
- return new ValueImpl(DoublePropertyState.doubleProperty("", value),
namePathMapper);
+ return newValue(DoublePropertyState.doubleProperty("", value),
namePathMapper);
}
@Override
public Value createValue(Calendar value) {
- return new ValueImpl(PropertyStates.createProperty("", value),
namePathMapper);
+ return newValue(PropertyStates.createProperty("", value),
namePathMapper);
}
@Override
public Value createValue(boolean value) {
- return new ValueImpl(BooleanPropertyState.booleanProperty("", value),
namePathMapper);
+ return newValue(BooleanPropertyState.booleanProperty("", value),
namePathMapper);
}
@Override
@@ -199,13 +202,13 @@ public class ValueFactoryImpl implements
"Node is not referenceable: " + value.getPath());
}
return weak
- ? new ValueImpl(GenericPropertyState.weakreferenceProperty("",
value.getUUID()), namePathMapper)
- : new ValueImpl(GenericPropertyState.referenceProperty("",
value.getUUID()), namePathMapper);
+ ? newValue(GenericPropertyState.weakreferenceProperty("",
value.getUUID()), namePathMapper)
+ : newValue(GenericPropertyState.referenceProperty("",
value.getUUID()), namePathMapper);
}
@Override
public Value createValue(BigDecimal value) {
- return new ValueImpl(DecimalPropertyState.decimalProperty("", value),
namePathMapper);
+ return newValue(DecimalPropertyState.decimalProperty("", value),
namePathMapper);
}
@Override
@@ -219,7 +222,7 @@ public class ValueFactoryImpl implements
case PropertyType.STRING:
return createValue(value);
case PropertyType.BINARY:
- return new
ValueImpl(BinaryPropertyState.binaryProperty("", value), namePathMapper);
+ return newValue(BinaryPropertyState.binaryProperty("",
value), namePathMapper);
case PropertyType.LONG:
return createValue(Conversions.convert(value).toLong());
case PropertyType.DOUBLE:
@@ -228,7 +231,7 @@ public class ValueFactoryImpl implements
if (ISO8601.parse(value) == null) {
throw new ValueFormatException("Invalid date " +
value);
}
- return new ValueImpl(GenericPropertyState.dateProperty("",
value), namePathMapper);
+ return newValue(GenericPropertyState.dateProperty("",
value), namePathMapper);
case PropertyType.BOOLEAN:
return createValue(Conversions.convert(value).toBoolean());
case PropertyType.NAME:
@@ -236,7 +239,7 @@ public class ValueFactoryImpl implements
if (oakName == null || !JcrNameParser.validate(oakName)) {
throw new ValueFormatException("Invalid name: " +
value);
}
- return new ValueImpl(GenericPropertyState.nameProperty("",
oakName), namePathMapper);
+ return newValue(GenericPropertyState.nameProperty("",
oakName), namePathMapper);
case PropertyType.PATH:
String oakValue = value;
if (value.startsWith("[") && value.endsWith("]")) {
@@ -247,20 +250,20 @@ public class ValueFactoryImpl implements
throw new ValueFormatException("Invalid path: " +
value);
}
}
- return new ValueImpl(GenericPropertyState.pathProperty("",
oakValue), namePathMapper);
+ return newValue(GenericPropertyState.pathProperty("",
oakValue), namePathMapper);
case PropertyType.REFERENCE:
if (!IdentifierManager.isValidUUID(value)) {
throw new ValueFormatException("Invalid reference
value " + value);
}
- return new
ValueImpl(GenericPropertyState.referenceProperty("", value), namePathMapper);
+ return newValue(GenericPropertyState.referenceProperty("",
value), namePathMapper);
case PropertyType.WEAKREFERENCE:
if (!IdentifierManager.isValidUUID(value)) {
throw new ValueFormatException("Invalid weak reference
value " + value);
}
- return new
ValueImpl(GenericPropertyState.weakreferenceProperty("", value),
namePathMapper);
+ return
newValue(GenericPropertyState.weakreferenceProperty("", value), namePathMapper);
case PropertyType.URI:
new URI(value);
- return new ValueImpl(GenericPropertyState.uriProperty("",
value), namePathMapper);
+ return newValue(GenericPropertyState.uriProperty("",
value), namePathMapper);
case PropertyType.DECIMAL:
return createValue(Conversions.convert(value).toDecimal());
default:
@@ -282,81 +285,14 @@ public class ValueFactoryImpl implements
}
}
- private ValueImpl createBinaryValue(InputStream value) throws IOException {
+ private ValueImpl createBinaryValue(InputStream value) throws IOException,
RepositoryException {
return createBinaryValue(root.createBlob(value));
}
- private ValueImpl createBinaryValue(Blob blob) {
+ private ValueImpl createBinaryValue(Blob blob) throws RepositoryException {
return new ValueImpl(BinaryPropertyState.binaryProperty("", blob),
namePathMapper);
}
//------------------------------------------------------------< ErrorValue
>---
- /**
- * Instances of this class represent a {@code Value} which couldn't be
retrieved.
- * All its accessors throw a {@code RepositoryException}.
- */
- private static class ErrorValue implements Value {
- private final Exception exception;
- private final int type;
-
- private ErrorValue(Exception exception, int type) {
- this.exception = exception;
- this.type = type;
- }
-
- @Override
- public String getString() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public InputStream getStream() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public Binary getBinary() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public long getLong() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public double getDouble() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public BigDecimal getDecimal() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public Calendar getDate() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public boolean getBoolean() throws RepositoryException {
- throw createException();
- }
-
- @Override
- public int getType() {
- return type;
- }
-
- private RepositoryException createException() {
- return new RepositoryException("Inaccessible value", exception);
- }
-
- @Override
- public String toString() {
- return "Inaccessible value: " + exception.getMessage();
- }
- }
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java?rev=1663296&r1=1663295&r2=1663296&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
Mon Mar 2 13:11:11 2015
@@ -17,12 +17,14 @@
package org.apache.jackrabbit.oak.plugins.value;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
+import javax.annotation.Nonnull;
import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -35,11 +37,15 @@ import org.apache.jackrabbit.oak.api.Blo
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of {@link Value} based on {@code PropertyState}.
*/
public class ValueImpl implements JackrabbitValue {
+ private static final Logger LOG = LoggerFactory.getLogger(ValueImpl.class);
public static Blob getBlob(Value value) throws RepositoryException {
if (value instanceof ValueImpl) {
@@ -50,6 +56,7 @@ public class ValueImpl implements Jackra
}
private final PropertyState propertyState;
+ private final Type<?> type;
private final int index;
private final NamePathMapper namePathMapper;
@@ -62,12 +69,15 @@ public class ValueImpl implements Jackra
* @param namePathMapper The name/path mapping used for converting JCR
names/paths to
* the internal representation.
* @throws IllegalArgumentException if {@code index <
propertyState.count()}
+ * @throws RepositoryException if the underlying node state cannot be
accessed
*/
- ValueImpl(PropertyState property, int index, NamePathMapper
namePathMapper) {
+ ValueImpl(@Nonnull PropertyState property, int index, @Nonnull
NamePathMapper namePathMapper)
+ throws RepositoryException {
checkArgument(index < property.count());
- this.propertyState = property;
+ this.propertyState = checkNotNull(property);
+ this.type = getType(property);
this.index = index;
- this.namePathMapper = namePathMapper;
+ this.namePathMapper = checkNotNull(namePathMapper);
}
/**
@@ -76,13 +86,53 @@ public class ValueImpl implements Jackra
* @param namePathMapper The name/path mapping used for converting JCR
names/paths to
* the internal representation.
* @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
+ * @throws RepositoryException if the underlying node state cannot be
accessed
*/
- ValueImpl(PropertyState property, NamePathMapper namePathMapper) {
+ ValueImpl(@Nonnull PropertyState property, @Nonnull NamePathMapper
namePathMapper)
+ throws RepositoryException {
this(checkSingleValued(property), 0, namePathMapper);
}
- Blob getBlob() {
- return propertyState.getValue(Type.BINARY, index);
+ private static PropertyState checkSingleValued(PropertyState property) {
+ checkArgument(!property.isArray());
+ return property;
+ }
+
+ /**
+ * Create a new {@code Value} instance
+ * @param property The property state this instance is based on
+ * @param index The index
+ * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
+ * the internal representation.
+ * @throws IllegalArgumentException if {@code index <
propertyState.count()}
+ */
+ @Nonnull
+ static Value newValue(@Nonnull PropertyState property, int index, @Nonnull
NamePathMapper namePathMapper) {
+ try {
+ return new ValueImpl(property, index, namePathMapper);
+ } catch (RepositoryException e) {
+ return new ErrorValue(e);
+ }
+ }
+
+ /**
+ * Create a new {@code Value} instance
+ * @param property The property state this instance is based on
+ * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
+ * the internal representation.
+ * @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
+ */
+ @Nonnull
+ static Value newValue(@Nonnull PropertyState property, @Nonnull
NamePathMapper namePathMapper) {
+ try {
+ return new ValueImpl(property, 0, namePathMapper);
+ } catch (RepositoryException e) {
+ return new ErrorValue(e);
+ }
+ }
+
+ Blob getBlob() throws RepositoryException {
+ return getValue(Type.BINARY, index);
}
/**
@@ -90,13 +140,8 @@ public class ValueImpl implements Jackra
* Oak representation instead of being mapped to their JCR representation.
* @return A String representation of the value of this property.
*/
- public String getOakString() {
- return propertyState.getValue(Type.STRING, index);
- }
-
- private static PropertyState checkSingleValued(PropertyState property) {
- checkArgument(!property.isArray());
- return property;
+ public String getOakString() throws RepositoryException {
+ return getValue(Type.STRING, index);
}
//--------------------------------------------------------------< Value
>---
@@ -106,7 +151,7 @@ public class ValueImpl implements Jackra
*/
@Override
public int getType() {
- return propertyState.getType().tag();
+ return type.tag();
}
/**
@@ -118,7 +163,7 @@ public class ValueImpl implements Jackra
case PropertyType.STRING:
case PropertyType.BINARY:
case PropertyType.BOOLEAN:
- return propertyState.getValue(Type.BOOLEAN, index);
+ return getValue(Type.BOOLEAN, index);
default:
throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
}
@@ -134,12 +179,12 @@ public class ValueImpl implements Jackra
case PropertyType.STRING:
case PropertyType.BINARY:
case PropertyType.DATE:
- String value = propertyState.getValue(Type.DATE, index);
+ String value = getValue(Type.DATE, index);
return Conversions.convert(value).toCalendar();
case PropertyType.LONG:
case PropertyType.DOUBLE:
case PropertyType.DECIMAL:
- return
Conversions.convert(propertyState.getValue(Type.LONG, index)).toCalendar();
+ return Conversions.convert(getValue(Type.LONG,
index)).toCalendar();
default:
throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
}
@@ -162,7 +207,7 @@ public class ValueImpl implements Jackra
case PropertyType.DOUBLE:
case PropertyType.DATE:
case PropertyType.DECIMAL:
- return propertyState.getValue(Type.DECIMAL, index);
+ return getValue(Type.DECIMAL, index);
default:
throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
}
@@ -185,7 +230,7 @@ public class ValueImpl implements Jackra
case PropertyType.DOUBLE:
case PropertyType.DATE:
case PropertyType.DECIMAL:
- return propertyState.getValue(Type.DOUBLE, index);
+ return getValue(Type.DOUBLE, index);
default:
throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
}
@@ -208,7 +253,7 @@ public class ValueImpl implements Jackra
case PropertyType.DOUBLE:
case PropertyType.DATE:
case PropertyType.DECIMAL:
- return propertyState.getValue(Type.LONG, index);
+ return getValue(Type.LONG, index);
default:
throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
}
@@ -247,7 +292,7 @@ public class ValueImpl implements Jackra
* @see javax.jcr.Value#getStream()
*/
@Override
- public InputStream getStream() throws IllegalStateException {
+ public InputStream getStream() throws IllegalStateException,
RepositoryException {
if (stream == null) {
stream = getBlob().getNewStream();
}
@@ -264,7 +309,12 @@ public class ValueImpl implements Jackra
@Override
public String getContentIdentity() {
- return getBlob().getContentIdentity();
+ try {
+ return getBlob().getContentIdentity();
+ } catch (RepositoryException e) {
+ LOG.warn("Error getting content identity", e);
+ return null;
+ }
}
//-------------------------------------------------------------< Object
>---
@@ -276,14 +326,23 @@ public class ValueImpl implements Jackra
public boolean equals(Object other) {
if (other instanceof ValueImpl) {
ValueImpl that = (ValueImpl) other;
- Type<?> type = propertyState.getType();
- if (type.isArray()) {
- type = type.getBaseType();
+ Type<?> thisType = this.type;
+ if (thisType.isArray()) {
+ thisType = thisType.getBaseType();
+ }
+ Type<?> thatType = that.type;
+ if (thatType.isArray()) {
+ thatType = thatType.getBaseType();
+ }
+ try {
+ return thisType == thatType
+ && Objects.equal(
+ getValue(thatType, index),
+ that.getValue(thatType, that.index));
+ } catch (RepositoryException e) {
+ LOG.warn("Error while comparing values", e);
+ return false;
}
- return type.tag() == that.propertyState.getType().tag()
- && Objects.equal(
- propertyState.getValue(type, index),
- that.propertyState.getValue(type, that.index));
} else {
return false;
}
@@ -294,16 +353,43 @@ public class ValueImpl implements Jackra
*/
@Override
public int hashCode() {
- if (getType() == PropertyType.BINARY) {
- return propertyState.getValue(Type.BINARY, index).hashCode();
- } else {
- return getOakString().hashCode();
+ try {
+ if (getType() == PropertyType.BINARY) {
+ return getValue(Type.BINARY, index).hashCode();
+ } else {
+ return getValue(Type.STRING, index).hashCode();
+ }
+ } catch (RepositoryException e) {
+ LOG.warn("Error while calculating hash code", e);
+ return 0;
}
}
@Override
public String toString() {
- return getOakString();
+ try {
+ return getValue(Type.STRING, index);
+ } catch (RepositoryException e) {
+ return e.toString();
+ }
+ }
+
+ //------------------------------------------------------------< private
>---
+
+ private <T> T getValue(Type<T> type, int index) throws RepositoryException
{
+ try {
+ return propertyState.getValue(type, index);
+ } catch (SegmentNotFoundException e) {
+ throw new RepositoryException(e);
+ }
+ }
+
+ private Type<?> getType(PropertyState property) throws RepositoryException
{
+ try {
+ return propertyState.getType();
+ } catch (SegmentNotFoundException e) {
+ throw new RepositoryException(e);
+ }
}
}
\ No newline at end of file
