-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Accept default value in placeholders for unresolved property values (#1)
- Loading branch information
Showing
9 changed files
with
513 additions
and
32 deletions.
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
src/main/java/org/codehaus/mojo/properties/DefaultValuesAwareExpansionBufferImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
package org.codehaus.mojo.properties; | ||
|
||
/* | ||
* 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. | ||
*/ | ||
|
||
/** | ||
* ExpansionBuffer implementation that allows processing of default values within property placeholders | ||
* | ||
* @author tdiamantis | ||
*/ | ||
public class DefaultValuesAwareExpansionBufferImpl extends ExpansionBuffer { | ||
public DefaultValuesAwareExpansionBufferImpl(String unresolved) { | ||
super(unresolved); | ||
} | ||
|
||
public KeyAndDefaultValue extractPropertyKeyAndDefaultValue() | ||
{ | ||
advanceToNextPrefix(); | ||
|
||
discardPrefix(); | ||
|
||
String key = beforeNextSuffix(); | ||
|
||
String defaultValue = defaultValue(); | ||
|
||
discardToAfterNextSuffix(); | ||
|
||
return new KeyAndDefaultValue(key, defaultValue); | ||
} | ||
|
||
protected String beforeNextSuffix() | ||
{ | ||
int defValuePos = unresolved.indexOf(":"); | ||
int propertySuffixPos = unresolved.indexOf("}"); | ||
|
||
//check default value separator only if before next suffix | ||
if (defValuePos != -1 && propertySuffixPos != -1 && defValuePos < propertySuffixPos) | ||
{ | ||
return unresolved.substring( 0, defValuePos ); | ||
} | ||
|
||
return unresolved.substring( 0, propertySuffixPos ); | ||
} | ||
|
||
private String defaultValue() | ||
{ | ||
int defValuePos = unresolved.indexOf( ":" ); | ||
int propertySuffixPos = unresolved.indexOf( "}" ); | ||
if (defValuePos != -1 && propertySuffixPos != -1 && (defValuePos+1) < propertySuffixPos) | ||
{ | ||
return unresolved.substring( defValuePos+1, propertySuffixPos ); | ||
} | ||
|
||
return null; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
src/main/java/org/codehaus/mojo/properties/ExpansionBufferImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package org.codehaus.mojo.properties; | ||
|
||
/* | ||
* 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. | ||
*/ | ||
|
||
/** | ||
* Default implementation of the ExpansionBuffer class | ||
* | ||
* @author tdiamantis | ||
*/ | ||
public class ExpansionBufferImpl extends ExpansionBuffer { | ||
public ExpansionBufferImpl(String unresolved) { | ||
super(unresolved); | ||
} | ||
|
||
public KeyAndDefaultValue extractPropertyKeyAndDefaultValue() | ||
{ | ||
advanceToNextPrefix(); | ||
|
||
discardPrefix(); | ||
|
||
String key = beforeNextSuffix(); | ||
|
||
discardToAfterNextSuffix(); | ||
|
||
return new KeyAndDefaultValue(key, null); | ||
} | ||
|
||
protected String beforeNextSuffix() | ||
{ | ||
int propertySuffixPos = unresolved.indexOf( "}" ); | ||
return unresolved.substring( 0, propertySuffixPos ); | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
src/main/java/org/codehaus/mojo/properties/KeyAndDefaultValue.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
package org.codehaus.mojo.properties; | ||
|
||
/* | ||
* 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. | ||
*/ | ||
|
||
/** | ||
* @author tdiamantis | ||
*/ | ||
public class KeyAndDefaultValue { | ||
private String key; | ||
private String defaultValue; | ||
|
||
public KeyAndDefaultValue(String key, String defaultValue) { | ||
this.key = key; | ||
this.defaultValue = defaultValue; | ||
} | ||
|
||
public String getKey() { | ||
return key; | ||
} | ||
|
||
public void setKey(String key) { | ||
this.key = key; | ||
} | ||
|
||
public String getDefaultValue() { | ||
return defaultValue; | ||
} | ||
|
||
public void setDefaultValue(String defaultValue) { | ||
this.defaultValue = defaultValue; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.