From 50b392ecaa9ba0b28400e779aba6f159b171788f Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Mon, 10 Oct 2016 11:29:59 +0200 Subject: [PATCH] Continuing renaming --- .../midpoint/prism/PrismParserImpl.java | 18 +++++++++--------- .../midpoint/prism/SerializerStringTarget.java | 2 +- .../midpoint/prism/lex/LexicalProcessor.java | 12 ++++++------ .../prism/lex/LexicalProcessorRegistry.java | 4 ++-- .../prism/lex/dom/DomLexicalProcessor.java | 14 +++++++------- .../lex/json/AbstractJsonLexicalProcessor.java | 10 +++++----- .../prism/lex/json/JsonLexicalProcessor.java | 4 ++-- .../prism/lex/json/YamlLexicalProcessor.java | 4 ++-- .../prism/marshaller/PrismBeanConverter.java | 2 +- .../midpoint/prism/TestXmlSerialization.java | 4 ++-- .../lex/AbstractLexicalProcessorTest.java | 18 +++++++++--------- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserImpl.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserImpl.java index 2daf5c9a482..d693d54c127 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserImpl.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserImpl.java @@ -89,7 +89,7 @@ public PrismParser compat() { protected PrismObject doParse() throws SchemaException, IOException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseObject(xnode, context); } @@ -105,7 +105,7 @@ private LexicalProcessor getParser() throws IOException { protected List> doParseObjects() throws IOException, SchemaException { LexicalProcessor lexicalProcessor = getParser(); - Collection xnodes = lexicalProcessor.parseCollection(source, context); + Collection xnodes = lexicalProcessor.readCollection(source, context); List> objects = new ArrayList<>(); for (XNode xnode : xnodes) { PrismObject object = helpers.xnodeProcessor.parseObject(xnode, context); @@ -116,41 +116,41 @@ protected List> doParseObjects() throws IOExce protected PrismContainer doParseContainer(Class clazz) throws SchemaException, IOException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseContainer(xnode, clazz, context); } protected PrismContainer doParseContainer(PrismContainerDefinition definition) throws SchemaException, IOException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseContainer(xnode, definition, context); } protected T doParseAtomicValue(QName typeName) throws IOException, SchemaException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseAtomicValue(xnode, typeName, context); } protected Object doParseAnyData() throws IOException, SchemaException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseAnyData(xnode, context); } protected T doParseAnyValue() throws IOException, SchemaException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseAnyValue(xnode, context); } protected JAXBElement doParseAnyValueAsJAXBElement() throws IOException, SchemaException { LexicalProcessor lexicalProcessor = getParser(); - XNode xnode = lexicalProcessor.parse(source, context); + XNode xnode = lexicalProcessor.read(source, context); return helpers.xnodeProcessor.parseAnyValueAsJAXBElement(xnode, context); } protected XNode doParseToXNode() throws IOException, SchemaException { - return getParser().parse(source, context); + return getParser().read(source, context); } } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java index 36b7203b14d..6143f295995 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java @@ -19,6 +19,6 @@ public SerializerStringTarget(@NotNull LexicalHelpers lexicalHelpers, @NotNull S @Override public String serialize(RootXNode xroot, SerializationContext context) throws SchemaException { - return lexicalHelpers.lexicalProcessorRegistry.parserFor(language).serializeToString(xroot, context); + return lexicalHelpers.lexicalProcessorRegistry.parserFor(language).write(xroot, context); } } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java index 35e0dd286e2..d6fe0b05622 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java @@ -34,16 +34,16 @@ */ public interface LexicalProcessor { - XNode parse(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException; + XNode read(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException; - Collection parseCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException; + Collection readCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException; - boolean canParse(File file) throws IOException; + boolean canRead(File file) throws IOException; - boolean canParse(String dataString); + boolean canRead(String dataString); - String serializeToString(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException; + String write(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException; - String serializeToString(RootXNode xnode, SerializationContext serializationContext) throws SchemaException; + String write(RootXNode xnode, SerializationContext serializationContext) throws SchemaException; } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java index e1ca9c91511..fe63cf9af48 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java @@ -55,7 +55,7 @@ public LexicalProcessorRegistry(SchemaRegistry schemaRegistry) { public LexicalProcessor findParser(File file) throws IOException { for (Map.Entry entry: parserMap.entrySet()) { LexicalProcessor aLexicalProcessor = entry.getValue(); - if (aLexicalProcessor.canParse(file)) { + if (aLexicalProcessor.canRead(file)) { return aLexicalProcessor; } } @@ -66,7 +66,7 @@ public LexicalProcessor findParser(File file) throws IOException { public LexicalProcessor findParser(String data){ for (Map.Entry entry: parserMap.entrySet()) { LexicalProcessor aLexicalProcessor = entry.getValue(); - if (aLexicalProcessor.canParse(data)) { + if (aLexicalProcessor.canRead(data)) { return aLexicalProcessor; } } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java index ba256d27773..ea41fafe00f 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java @@ -64,11 +64,11 @@ public DomLexicalProcessor(SchemaRegistry schemaRegistry) { @Deprecated public XNode parse(File file, ParsingContext parsingContext) throws SchemaException, IOException { - return parse(new ParserFileSource(file), parsingContext); + return read(new ParserFileSource(file), parsingContext); } @Override - public XNode parse(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { + public XNode read(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { if (source instanceof ParserElementSource) { return parse(((ParserElementSource) source).getElement()); } @@ -85,7 +85,7 @@ public XNode parse(ParserSource source, ParsingContext parsingContext) throws Sc } @Override - public Collection parseCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { + public Collection readCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { InputStream is = source.getInputStream(); try { Document document = DOMUtil.parse(is); @@ -391,7 +391,7 @@ private SchemaXNode parseSchemaElement(Element schemaElement) { } @Override - public boolean canParse(File file) throws IOException { + public boolean canRead(File file) throws IOException { if (file == null) { return false; } @@ -399,7 +399,7 @@ public boolean canParse(File file) throws IOException { } @Override - public boolean canParse(String dataString) { + public boolean canRead(String dataString) { if (dataString == null) { return false; } @@ -415,7 +415,7 @@ public boolean canParse(String dataString) { } @Override - public String serializeToString(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException { + public String write(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException { DomLexicalWriter serializer = new DomLexicalWriter(this, schemaRegistry); RootXNode xroot = LexicalUtils.createRootXNode(xnode, rootElementName); Element element = serializer.serialize(xroot); @@ -423,7 +423,7 @@ public String serializeToString(XNode xnode, QName rootElementName, Serializatio } @Override - public String serializeToString(RootXNode xnode, SerializationContext serializationContext) throws SchemaException { + public String write(RootXNode xnode, SerializationContext serializationContext) throws SchemaException { DomLexicalWriter serializer = new DomLexicalWriter(this, schemaRegistry); Element element = serializer.serialize(xnode); return DOMUtil.serializeDOMToString(element); diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java index c507dd17715..07da73ba509 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java @@ -66,7 +66,7 @@ public abstract class AbstractJsonLexicalProcessor implements LexicalProcessor { //region Parsing implementation @Override - public RootXNode parse(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { + public RootXNode read(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { InputStream is = source.getInputStream(); try { JsonParser parser = createJacksonParser(is); @@ -79,7 +79,7 @@ public RootXNode parse(ParserSource source, ParsingContext parsingContext) throw } @Override - public Collection parseCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { + public Collection readCollection(ParserSource source, ParsingContext parsingContext) throws SchemaException, IOException { throw new UnsupportedOperationException("Parse objects not supported for json and yaml."); // why? } @@ -431,8 +431,8 @@ private JsonSerializationContext(@NotNull JsonGenerator generator, @Nullable Ser } } @Override - public String serializeToString(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException { - return serializeToString(LexicalUtils.createRootXNode(xnode, rootElementName), serializationContext); + public String write(XNode xnode, QName rootElementName, SerializationContext serializationContext) throws SchemaException { + return write(LexicalUtils.createRootXNode(xnode, rootElementName), serializationContext); } protected abstract JsonGenerator createJacksonGenerator(StringWriter out) throws SchemaException; @@ -440,7 +440,7 @@ public String serializeToString(XNode xnode, QName rootElementName, Serializatio protected abstract void writeExplicitType(QName explicitType, JsonGenerator generator) throws IOException; @Override - public String serializeToString(RootXNode root, SerializationContext prismSerializationContext) throws SchemaException { + public String write(RootXNode root, SerializationContext prismSerializationContext) throws SchemaException { StringWriter out = new StringWriter(); try ( JsonGenerator generator = createJacksonGenerator(out) ) { JsonSerializationContext ctx = new JsonSerializationContext(generator, prismSerializationContext); diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java index 482bca6489d..3c2034d7f3e 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java @@ -42,7 +42,7 @@ public class JsonLexicalProcessor extends AbstractJsonLexicalProcessor { @Override - public boolean canParse(File file) throws IOException { + public boolean canRead(File file) throws IOException { if (file == null) { return false; } @@ -50,7 +50,7 @@ public boolean canParse(File file) throws IOException { } @Override - public boolean canParse(String dataString) { + public boolean canRead(String dataString) { if (dataString == null) { return false; } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java index 8ba883634cf..727dbd6fdeb 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java @@ -58,7 +58,7 @@ public class YamlLexicalProcessor extends AbstractJsonLexicalProcessor { //------------------------END OF METHODS FOR SERIALIZATION ------------------------------- @Override - public boolean canParse(File file) throws IOException { + public boolean canRead(File file) throws IOException { if (file == null) { return false; } @@ -66,7 +66,7 @@ public boolean canParse(File file) throws IOException { } @Override - public boolean canParse(String dataString) { + public boolean canRead(String dataString) { if (dataString == null) { return false; } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanConverter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanConverter.java index 82314b138f8..4dd63b78fcd 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanConverter.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanConverter.java @@ -158,7 +158,7 @@ public T unmarshall(MapXNode xnode, Class beanClass, ParsingContext pc) t } else { Map.Entry entry = xnode.entrySet().iterator().next(); DomLexicalProcessor domParser = prismContext.getParserDom(); - String value = domParser.serializeToString(entry.getValue(), entry.getKey(), null); + String value = domParser.write(entry.getValue(), entry.getKey(), null); return (T) new XmlAsStringType(value); } } diff --git a/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java b/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java index 6fc1f9b9d0a..8b2077ab974 100644 --- a/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java +++ b/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java @@ -60,12 +60,12 @@ public void testHandlingInvalidChars() throws Exception { // THEN - String ok = prismContext.getParserDom().serializeToString(valOkNode, new QName("ok"), null); + String ok = prismContext.getParserDom().write(valOkNode, new QName("ok"), null); System.out.println("correct value serialized to: " + ok); assertEquals("Wrong serialization", "abcdef", ok.trim()); // todo make this less brittle with regards to serialization style try { - String wrong = prismContext.getParserDom().serializeToString(valWrongNode, new QName("wrong"), null); + String wrong = prismContext.getParserDom().write(valWrongNode, new QName("wrong"), null); System.out.println("wrong value serialized to: " + wrong); assert false : "Wrong value serialization had to fail but it didn't!"; } catch (RuntimeException e) { diff --git a/infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java b/infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java index 779d23d728e..802c105a15d 100644 --- a/infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java +++ b/infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java @@ -97,7 +97,7 @@ public void testParseUserToPrism() throws Exception { XNodeProcessor processor = new XNodeProcessor(prismContext); // WHEN (parse to xnode) - XNode xnode = lexicalProcessor.parse(getFileSource(USER_JACK_FILE_BASENAME), ParsingContext.createDefault()); + XNode xnode = lexicalProcessor.read(getFileSource(USER_JACK_FILE_BASENAME), ParsingContext.createDefault()); System.out.println("XNode after parsing:"); System.out.println(xnode.debugDump()); @@ -129,7 +129,7 @@ public void testParseUserRoundTrip() throws Exception { XNodeProcessor processor = new XNodeProcessor(prismContext); // WHEN (parse) - XNode xnode = lexicalProcessor.parse(getFileSource(USER_JACK_FILE_BASENAME), ParsingContext.createDefault()); + XNode xnode = lexicalProcessor.read(getFileSource(USER_JACK_FILE_BASENAME), ParsingContext.createDefault()); System.out.println("\nParsed xnode:"); System.out.println(xnode.debugDump()); PrismObject user = processor.parseObject(xnode, ParsingContext.createDefault()); @@ -142,7 +142,7 @@ public void testParseUserRoundTrip() throws Exception { // WHEN (re-serialize to XNode) XNode serializedXNode = processor.serializeObject(user, true); - String serializedString = lexicalProcessor.serializeToString(serializedXNode, new QName(NS_FOO, "user"), null); + String serializedString = lexicalProcessor.write(serializedXNode, new QName(NS_FOO, "user"), null); // THEN System.out.println("\nXNode after re-serialization:"); @@ -175,7 +175,7 @@ public void testParseUserRoundTrip() throws Exception { validateUserSchema(serializedString, prismContext); // WHEN (re-parse) - XNode reparsedXnode = lexicalProcessor.parse(new ParserStringSource(serializedString), ParsingContext.createDefault()); + XNode reparsedXnode = lexicalProcessor.read(new ParserStringSource(serializedString), ParsingContext.createDefault()); PrismObject reparsedUser = processor.parseObject(reparsedXnode, ParsingContext.createDefault()); // THEN @@ -213,7 +213,7 @@ public void testParseResourceRumToPrism() throws Exception { XNodeProcessor processor = new XNodeProcessor(prismContext); // WHEN (parse to xnode) - XNode xnode = lexicalProcessor.parse(getFileSource(RESOURCE_RUM_FILE_BASENAME), ParsingContext.createDefault()); + XNode xnode = lexicalProcessor.read(getFileSource(RESOURCE_RUM_FILE_BASENAME), ParsingContext.createDefault()); System.out.println("XNode after parsing:"); System.out.println(xnode.debugDump()); @@ -239,7 +239,7 @@ public void testParseResourceRoundTrip() throws Exception { XNodeProcessor processor = new XNodeProcessor(prismContext); // WHEN (parse) - XNode xnode = lexicalProcessor.parse(getFileSource(RESOURCE_RUM_FILE_BASENAME), ParsingContext.createDefault()); + XNode xnode = lexicalProcessor.read(getFileSource(RESOURCE_RUM_FILE_BASENAME), ParsingContext.createDefault()); PrismObject resource = processor.parseObject(xnode, ParsingContext.createDefault()); // THEN @@ -250,7 +250,7 @@ public void testParseResourceRoundTrip() throws Exception { // WHEN (re-serialize to XNode) XNode serializedXNode = processor.serializeObject(resource, true); - String serializedString = lexicalProcessor.serializeToString(serializedXNode, new QName(NS_FOO, "resource"), null); + String serializedString = lexicalProcessor.write(serializedXNode, new QName(NS_FOO, "resource"), null); // THEN System.out.println("\nXNode after re-serialization:"); @@ -284,7 +284,7 @@ public void testParseResourceRoundTrip() throws Exception { validateResourceSchema(serializedString, prismContext); // WHEN (re-parse) - XNode reparsedXnode = lexicalProcessor.parse(new ParserStringSource(serializedString), ParsingContext.createDefault()); + XNode reparsedXnode = lexicalProcessor.read(new ParserStringSource(serializedString), ParsingContext.createDefault()); PrismObject reparsedResource = processor.parseObject(reparsedXnode, ParsingContext.createDefault()); // THEN @@ -391,7 +391,7 @@ public void testParseEventHandler() throws Exception { XNodeProcessor processor = new XNodeProcessor(prismContext); // WHEN (parse to xnode) - RootXNode xnode = (RootXNode) lexicalProcessor.parse(getFileSource(EVENT_HANDLER_FILE_BASENAME), ParsingContext.createDefault()); + RootXNode xnode = (RootXNode) lexicalProcessor.read(getFileSource(EVENT_HANDLER_FILE_BASENAME), ParsingContext.createDefault()); System.out.println("XNode after parsing:"); System.out.println(xnode.debugDump());