From 545c500acc85aae80d8beb0233d30d521a68fcd1 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 22 Jan 2020 11:09:23 -0500 Subject: [PATCH] Replace DOS newlines with unix --- ...indingGroovyObjectCustomizerDecorator.java | 124 +++++++++--------- .../integration/jdbc/LockInterceptor.java | 72 +++++----- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java index aeb3da4d36..4dfc75f919 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java @@ -1,62 +1,62 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * Licensed 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 - * - * https://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.springframework.integration.groovy; - -import java.util.Map; - -import org.springframework.scripting.groovy.GroovyObjectCustomizer; -import org.springframework.util.Assert; - -import groovy.lang.Binding; -import groovy.lang.GroovyObject; -import groovy.lang.Script; - -/** - * @author Dave Syer - * @author Oleg Zhurakousky - * @author Mark Fisher - * @since 2.0 - */ -class VariableBindingGroovyObjectCustomizerDecorator implements GroovyObjectCustomizer { - - private volatile Map variables; - - private volatile GroovyObjectCustomizer customizer; - - - public void setVariables(Map variables) { - this.variables = variables; - } - - public void setCustomizer(GroovyObjectCustomizer customizer) { - this.customizer = customizer; - } - - public void customize(GroovyObject goo) { - Assert.state(goo instanceof Script, "Expected a Script"); - if (this.variables != null) { - Binding binding = ((Script) goo).getBinding(); - for (Map.Entry entry : this.variables.entrySet()) { - binding.setVariable(entry.getKey(), entry.getValue()); - } - } - if (this.customizer != null) { - this.customizer.customize(goo); - } - } - -} +/* + * Copyright 2002-2019 the original author or authors. + * + * Licensed 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 + * + * https://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.springframework.integration.groovy; + +import java.util.Map; + +import org.springframework.scripting.groovy.GroovyObjectCustomizer; +import org.springframework.util.Assert; + +import groovy.lang.Binding; +import groovy.lang.GroovyObject; +import groovy.lang.Script; + +/** + * @author Dave Syer + * @author Oleg Zhurakousky + * @author Mark Fisher + * @since 2.0 + */ +class VariableBindingGroovyObjectCustomizerDecorator implements GroovyObjectCustomizer { + + private volatile Map variables; + + private volatile GroovyObjectCustomizer customizer; + + + public void setVariables(Map variables) { + this.variables = variables; + } + + public void setCustomizer(GroovyObjectCustomizer customizer) { + this.customizer = customizer; + } + + public void customize(GroovyObject goo) { + Assert.state(goo instanceof Script, "Expected a Script"); + if (this.variables != null) { + Binding binding = ((Script) goo).getBinding(); + for (Map.Entry entry : this.variables.entrySet()) { + binding.setVariable(entry.getKey(), entry.getValue()); + } + } + if (this.customizer != null) { + this.customizer.customize(goo); + } + } + +} diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/LockInterceptor.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/LockInterceptor.java index 2b7898b552..b5c29573db 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/LockInterceptor.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/LockInterceptor.java @@ -1,36 +1,36 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * Licensed 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 - * - * https://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.springframework.integration.jdbc; - -import java.util.concurrent.locks.ReentrantLock; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; - -/** - * @author Dave Syer - * - */ -public class LockInterceptor extends ReentrantLock implements MethodInterceptor { - - private static final long serialVersionUID = 1L; - - public synchronized Object invoke(MethodInvocation invocation) throws Throwable { - return invocation.proceed(); - } - -} +/* + * Copyright 2002-2019 the original author or authors. + * + * Licensed 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 + * + * https://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.springframework.integration.jdbc; + +import java.util.concurrent.locks.ReentrantLock; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + +/** + * @author Dave Syer + * + */ +public class LockInterceptor extends ReentrantLock implements MethodInterceptor { + + private static final long serialVersionUID = 1L; + + public synchronized Object invoke(MethodInvocation invocation) throws Throwable { + return invocation.proceed(); + } + +}