Skip to content

C
core
Kaydet (Commit) 9f586e2f authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

Remove pointless SerfRequestProcessorImplFac indirection. 

Change-Id: If8549893a686c7a665adde0436d377d6d695e5bf
üst 70cc2b19
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 133 deletions
ucb/Library_ucpdav1.mk
Dosyayı görüntüle @ 9f586e2f
...@@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ...@@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
ucb/source/ucp/webdav/SerfPutReqProcImpl \ ucb/source/ucp/webdav/SerfPutReqProcImpl \
ucb/source/ucp/webdav/SerfRequestProcessor \ ucb/source/ucp/webdav/SerfRequestProcessor \
ucb/source/ucp/webdav/SerfRequestProcessorImpl \ ucb/source/ucp/webdav/SerfRequestProcessorImpl \
ucb/source/ucp/webdav/SerfRequestProcessorImplFac \
ucb/source/ucp/webdav/SerfSession \ ucb/source/ucp/webdav/SerfSession \
ucb/source/ucp/webdav/SerfUri \ ucb/source/ucp/webdav/SerfUri \
ucb/source/ucp/webdav/UCBDeadPropertyValue \ ucb/source/ucp/webdav/UCBDeadPropertyValue \
......
ucb/source/ucp/webdav/SerfRequestProcessor.cxx
Dosyayı görüntüle @ 9f586e2f
...@@ -18,10 +18,18 @@ ...@@ -18,10 +18,18 @@
*/ */
#include "SerfRequestProcessor.hxx" #include "SerfRequestProcessor.hxx"
#include "SerfRequestProcessorImpl.hxx"
#include "SerfRequestProcessorImplFac.hxx"
#include "SerfCallbacks.hxx" #include "SerfCallbacks.hxx"
#include "SerfSession.hxx" #include "SerfSession.hxx"
#include "SerfPropFindReqProcImpl.hxx"
#include "SerfPropPatchReqProcImpl.hxx"
#include "SerfGetReqProcImpl.hxx"
#include "SerfHeadReqProcImpl.hxx"
#include "SerfPutReqProcImpl.hxx"
#include "SerfPostReqProcImpl.hxx"
#include "SerfDeleteReqProcImpl.hxx"
#include "SerfMkColReqProcImpl.hxx"
#include "SerfCopyReqProcImpl.hxx"
#include "SerfMoveReqProcImpl.hxx"
#include <apr_strings.h> #include <apr_strings.h>
...@@ -80,7 +88,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth, ...@@ -80,7 +88,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth,
std::vector< DAVResource > & ioResources, std::vector< DAVResource > & ioResources,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createPropFindReqProcImpl( mPathStr, mpProcImpl = new SerfPropFindReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inDepth, inDepth,
inPropNames, inPropNames,
...@@ -95,7 +103,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth, ...@@ -95,7 +103,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo, std::vector< DAVResourceInfo > & ioResInfo,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createPropFindReqProcImpl( mPathStr, mpProcImpl = new SerfPropFindReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inDepth, inDepth,
ioResInfo ); ioResInfo );
...@@ -108,7 +116,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth, ...@@ -108,7 +116,7 @@ bool SerfRequestProcessor::processPropFind( const Depth inDepth,
bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > & inProperties, bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > & inProperties,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createPropPatchReqProcImpl( mPathStr, mpProcImpl = new SerfPropPatchReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inProperties ); inProperties );
outSerfStatus = runProcessor(); outSerfStatus = runProcessor();
...@@ -120,7 +128,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > ...@@ -120,7 +128,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue >
bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createGetReqProcImpl( mPathStr, mpProcImpl = new SerfGetReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
xioInStrm ); xioInStrm );
outSerfStatus = runProcessor(); outSerfStatus = runProcessor();
...@@ -134,7 +142,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser ...@@ -134,7 +142,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser
DAVResource & ioResource, DAVResource & ioResource,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createGetReqProcImpl( mPathStr, mpProcImpl = new SerfGetReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
xioInStrm, xioInStrm,
inHeaderNames, inHeaderNames,
...@@ -148,7 +156,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser ...@@ -148,7 +156,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser
bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createGetReqProcImpl( mPathStr, mpProcImpl = new SerfGetReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
xioOutStrm ); xioOutStrm );
outSerfStatus = runProcessor(); outSerfStatus = runProcessor();
...@@ -162,7 +170,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com ...@@ -162,7 +170,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com
DAVResource & ioResource, DAVResource & ioResource,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createGetReqProcImpl( mPathStr, mpProcImpl = new SerfGetReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
xioOutStrm, xioOutStrm,
inHeaderNames, inHeaderNames,
...@@ -177,7 +185,7 @@ bool SerfRequestProcessor::processHead( const std::vector< OUString > & inHeader ...@@ -177,7 +185,7 @@ bool SerfRequestProcessor::processHead( const std::vector< OUString > & inHeader
DAVResource & ioResource, DAVResource & ioResource,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createHeadReqProcImpl( mPathStr, mpProcImpl = new SerfHeadReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inHeaderNames, inHeaderNames,
ioResource ); ioResource );
...@@ -191,7 +199,7 @@ bool SerfRequestProcessor::processPut( const char* inData, ...@@ -191,7 +199,7 @@ bool SerfRequestProcessor::processPut( const char* inData,
apr_size_t inDataLen, apr_size_t inDataLen,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = createPutReqProcImpl( mPathStr, mpProcImpl = new SerfPutReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData, inData,
inDataLen ); inDataLen );
...@@ -212,7 +220,7 @@ bool SerfRequestProcessor::processPost( const char* inData, ...@@ -212,7 +220,7 @@ bool SerfRequestProcessor::processPost( const char* inData,
OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
mReferer = apr_pstrdup( mrSerfSession.getAprPool(), mReferer = apr_pstrdup( mrSerfSession.getAprPool(),
OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createPostReqProcImpl( mPathStr, mpProcImpl = new SerfPostReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData, inData,
inDataLen, inDataLen,
...@@ -236,7 +244,7 @@ bool SerfRequestProcessor::processPost( const char* inData, ...@@ -236,7 +244,7 @@ bool SerfRequestProcessor::processPost( const char* inData,
OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
mReferer = apr_pstrdup( mrSerfSession.getAprPool(), mReferer = apr_pstrdup( mrSerfSession.getAprPool(),
OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createPostReqProcImpl( mPathStr, mpProcImpl = new SerfPostReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData, inData,
inDataLen, inDataLen,
...@@ -251,7 +259,7 @@ bool SerfRequestProcessor::processPost( const char* inData, ...@@ -251,7 +259,7 @@ bool SerfRequestProcessor::processPost( const char* inData,
// DELETE // DELETE
bool SerfRequestProcessor::processDelete( apr_status_t& outSerfStatus ) bool SerfRequestProcessor::processDelete( apr_status_t& outSerfStatus )
{ {
mpProcImpl = createDeleteReqProcImpl( mPathStr, mpProcImpl = new SerfDeleteReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders ); mrSerfSession.getRequestEnvironment().m_aRequestHeaders );
outSerfStatus = runProcessor(); outSerfStatus = runProcessor();
...@@ -261,7 +269,7 @@ bool SerfRequestProcessor::processDelete( apr_status_t& outSerfStatus ) ...@@ -261,7 +269,7 @@ bool SerfRequestProcessor::processDelete( apr_status_t& outSerfStatus )
// MKCOL // MKCOL
bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus ) bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus )
{ {
mpProcImpl = createMkColReqProcImpl( mPathStr, mpProcImpl = new SerfMkColReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders ); mrSerfSession.getRequestEnvironment().m_aRequestHeaders );
outSerfStatus = runProcessor(); outSerfStatus = runProcessor();
...@@ -275,7 +283,7 @@ bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath, ...@@ -275,7 +283,7 @@ bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath,
{ {
mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(),
OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createCopyReqProcImpl( mPathStr, mpProcImpl = new SerfCopyReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
mDestPathStr, mDestPathStr,
inOverwrite ); inOverwrite );
...@@ -291,7 +299,7 @@ bool SerfRequestProcessor::processMove( const OUString & inDestinationPath, ...@@ -291,7 +299,7 @@ bool SerfRequestProcessor::processMove( const OUString & inDestinationPath,
{ {
mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(),
OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createMoveReqProcImpl( mPathStr, mpProcImpl = new SerfMoveReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
mDestPathStr, mDestPathStr,
inOverwrite ); inOverwrite );
......
ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx deleted 100644 → 0
Dosyayı görüntüle @ 70cc2b19
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* 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 .
*/
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX
#include <vector>
#include <rtl/ustring.hxx>
#include "DAVTypes.hxx"
#include "DAVResource.hxx"
#include "SerfRequestProcessorImpl.hxx"
#include "SerfInputStream.hxx"
#include <com/sun/star/io/XOutputStream.hpp>
namespace http_dav_ucp
{
SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const Depth inDepth,
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources );
SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo );
SerfRequestProcessorImpl* createPropPatchReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const std::vector< ProppatchValue > & inProperties );
SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm );
SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm,
const std::vector< OUString > & inHeaderNames,
DAVResource& ioResource );
SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm );
SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm,
const std::vector< OUString > & inHeaderNames,
DAVResource& ioResource );
SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const std::vector< OUString > & inHeaderNames,
DAVResource& ioResource );
SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const char* inData,
apr_size_t inDataLen );
SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const char* inData,
apr_size_t inDataLen,
const char* inContentType,
const char* inReferer,
const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm );
SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
const char* inData,
apr_size_t inDataLen,
const char* inContentType,
const char* inReferer,
const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm );
SerfRequestProcessorImpl* createDeleteReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders );
SerfRequestProcessorImpl* createMkColReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders );
SerfRequestProcessorImpl* createCopyReqProcImpl( const char* inSourcePath,
const DAVRequestHeaders& inRequestHeaders,
const char* inDestinationPath,
const bool inOverwrite );
SerfRequestProcessorImpl* createMoveReqProcImpl( const char* inSourcePath,
const DAVRequestHeaders& inRequestHeaders,
const char* inDestinationPath,
const bool inOverwrite );
} // namespace http_dav_ucp
#endif // INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment